[OE-3662] JS fixes