fixing filter regex issues