Query Builder Improvments

Query Builder Improvments - Step 1.