Trying to fix filtering disaster

Trying to fix filtering disaster!