Revert c1f426b..d1b5730

This rolls back to commit c1f426b72f5e9aad46d3e6410a908a3db14896eb.
This commit has working search results as well as map