Refactor search

refactor search query to be simpler and based off the tested queries in the geopipes-elasticsearch-backend module.