Fix regex filter issues