some js issue fixed