Adds in ability for filter queries
Updates with fixes
Merge pull request #14 from loverly/filter_query_update

Adds in ability for filter queries