Minor changes to search