[OE-5154] fixed some bugs