[Refactor] #4 Making queries less stringly-typed
[Feature] #3 Filtering now refines data, rather than just removing it