close #60
quick fix to search queries, also close #160