Updated queries, working on more complex queries/criteria
Updated criteria
Merge pull request #178 from ariveralee/proto

Updated queries/criteria