Fixed issues with length of matches on non-alphanumeric