Fix issue with regex and issue with filters