Stop hardcoding filter queries