Removed whereCriteriaVisible filter