* minor modification for query_builder.py