removed full path dependencies to query_parser