Revise regex instead of unescaping js.
Merge branch 'ari-4020' into qa