add underscore and hyphen separator matches