tweak regex and add underscore