Rework the select filters