Xss fix for bootstrap3 branch