Fixed filter behavior inconsistencies