[OE-3663] JS fixes