v3: Allow hyphen character in regex pattern to use support queries as is

v3: Allow hyphen character in regex pattern to use support queries as is #686