[OE-3661] JS fixes