Minor improvements to 'Search' functionality