specs for search
cleanup
oops, sigh
Merge pull request #213 from Petercopter/search-fixes

Search fixes