more null checks in filter