Fixes ZEN-9050 (reviewed by epowell) Widen the RegEx fields to the extent possible