[BUG #7292] '-' has to be last char in regex character class
[BUG #7292] better escape '-' in character class