[OE-3659] JS fixes