Minor improvements to search