Switched queries over to using filters