Js issue fixed