CON-2230 Improving regex