add search venue feature and clean up code a bit