Make regex's more lenient; fix 'Could not import' error on Risk import [story:46649945]