i058959 - for new logic of javascript for fixing bugs