query_parser back to original version(after adding tricks)