Fix XSS vulnerability

Is a hack atm, would need more considered thought later

Change-Id: Ifa165b73df0a0d6ff6bc90def961d257ccb4c386