fix #2637
cleaned up the regex to remove extra qualifiers
used character sets where possible for clarity
main expression optimized