[OE-3649] JS fixes