Building queries

Finished basic queries, for optional searches. 
check your spelling of "search-query" ;-)