Fixed XSS & Graph limit