Clearing up simple_search pull request