Update to filter results
Fixed defect