[OE-4203] EyeDraw checker fixes