SONAR-3893 Added ampersand encoding