[BUGFIX] Fix override handling for element specific field values