[OE-4268] FieldImages fixes