Filter better on click