Making the filter options good