DEVMINEFI-222: xss Problem