Updated queries/criteria 

working on more complex queries/criteria