Resolved issue of filtering