--fixed filtering for CRM-12192