Add deliverable 3 queries and fix deliverable 2 queries