Fix #252 Events Calendar references (& XSS Added)