Regex to accommodate optional fields [RTFACT-21337]