Handle the hyphen/dash better in the regex group and add plus sign.