rewires filtering queries. minor cleanup while at it.
rewires filtering queries. minor cleanup while at it.

stopfstedt/ilios,thecoolestguy/ilios,ilios/ilios,stopfstedt/ilios,Trott/ilios,Trott/ilios,dartajax/ilios,ilios/ilios,thecoolestguy/ilios,dartajax/ilios