Query Builder Step 1

Query Builder Step 1 improvments.