Adding more of the WHERE and FILTER options