LPS-36613 Update regex, it is fragile and we may have to keep updating it but currently we don't have a choice