Fixing the filter issue