Enhancements to the filter regexs