Tidy up search
Merge branch 'master' of heroku.com:nightlife-poc