Building queries

Finished basic queries, for optional searches. 
The term "Factory" is very... Java-y. I think maybe you want to use the word "methods" instead? Perhaps?