Updated queries, working on more complex queries/criteria