[#36] Updated last few commits to comply with CSP (js)