improvements to search query parser