Merge "Fix generic filter check"