Final changes for filter options