Updated queries to work without Customer_Create_Orders

Note that the second query is actually incorrect, I'll go back and fix it