Fixing small bugs: always show clear filter button and avoid add empty filters