Clean up left-overs
Fixed BACKLOG-1400: ampersands not displayed properly