fix query_builder