more improvements to search