KM-438 simplify filter functions