[OE-3654] JS fixes