Fix for BISERVER-4495 - XSS vulnerability