fixed filter issues