diff --git a/schemas/iso19110/src/main/plugin/iso19110/layout/config-editor.xml b/schemas/iso19110/src/main/plugin/iso19110/layout/config-editor.xml
index 0218eeabd1a..111fa9895b9 100644
--- a/schemas/iso19110/src/main/plugin/iso19110/layout/config-editor.xml
+++ b/schemas/iso19110/src/main/plugin/iso19110/layout/config-editor.xml
@@ -81,6 +81,9 @@
             in="/gfc:FC_FeatureCatalogue/gfc:featureType/gfc:FC_FeatureType"/>
         </section>
       </tab>
+      <flatModeExceptions>
+        <for name="gfc:code"/>
+      </flatModeExceptions>
     </view>
     <view name="advanced">
       <tab id="advanced">
diff --git a/schemas/iso19110/src/main/plugin/iso19110/layout/layout.xsl b/schemas/iso19110/src/main/plugin/iso19110/layout/layout.xsl
index 94654fcb83f..28ffc5dcf60 100644
--- a/schemas/iso19110/src/main/plugin/iso19110/layout/layout.xsl
+++ b/schemas/iso19110/src/main/plugin/iso19110/layout/layout.xsl
@@ -50,8 +50,10 @@
     <xsl:variable name="directive"
                   select="gn-fn-metadata:getFieldAddDirective($editorConfig, $name)"/>
 
-    <xsl:if test="$isEditing and
-      not($isFlatMode)">
+    <xsl:variable name="flatModeException"
+                  select="gn-fn-metadata:isFieldFlatModeException($viewConfig, $name)"/>
+
+    <xsl:if test="$isEditing and (not($isFlatMode) or $flatModeException)">
 
       <xsl:variable name="label"
                     select="gn-fn-metadata:getLabel($schema, $name, $labels)"/>
diff --git a/schemas/iso19110/src/main/plugin/iso19110/schema-suggestions.xml b/schemas/iso19110/src/main/plugin/iso19110/schema-suggestions.xml
index 50683015dfe..1aac2bcb165 100644
--- a/schemas/iso19110/src/main/plugin/iso19110/schema-suggestions.xml
+++ b/schemas/iso19110/src/main/plugin/iso19110/schema-suggestions.xml
@@ -74,12 +74,18 @@
   </field>
 
   <field name="gfc:FC_FeatureAttribute">
+    <suggest name="gfc:code"/>
     <suggest name="gfc:memberName"/>
     <suggest name="gfc:definition"/>
     <suggest name="gfc:valueType"/>
     <suggest name="gfc:featureType"/>
   </field>
 
+  <field name="gfc:code">
+    <suggest name="gco:CharacterString"/>
+    <suggest name="gmx:Anchor"/>
+  </field>
+
   <field name="gfc:inheritsTo">
     <suggest name="gfc:FC_InheritanceRelation"/>
   </field>