remove combined filter, expose 2 text fields #1495