Fixes in db_query
Fixed conflict in db_query