Fix a few oddities with current search implementation
Merge pull request #1458 from darkwing/fix-search-niggles

Fix a few oddities with current search implementation