[OE-4054] Fixed conflicting field ids