A.5 Search Improvements