diff --git a/.env.template b/.env.template
index cd8df88fe0..9be2290499 100644
--- a/.env.template
+++ b/.env.template
@@ -78,3 +78,7 @@ ADMIN_EMAIL=
 # Admin user password: used only when default system admin user is created the first time
 # it MUST BE DELETED after the first startup
 ADMIN_PASSWORD=
+
+# Experimental features
+# if set to true, experimental features will be enabled in the UI
+EXPERIMENTAL_FEATURES=false
diff --git a/common/analysis/chain.js b/common/analysis/chain.js
index b7b69b760a..75e5d236d5 100644
--- a/common/analysis/chain.js
+++ b/common/analysis/chain.js
@@ -24,7 +24,6 @@ export const keys = {
 export const keysProps = {
   labels: ObjectUtils.keysProps.labels,
   descriptions: ObjectUtils.keysProps.descriptions,
-  cycles: ObjectUtils.keysProps.cycles,
   hasSamplingDesign: 'hasSamplingDesign',
   samplingDesign: 'samplingDesign',
   analysisNodeDefs: 'analysisNodeDefs',
@@ -46,7 +45,6 @@ export const {
   getUuid,
   getProps,
   getPropsDiff,
-  getCycles,
   getDateCreated,
   getDateModified,
   getDescriptions,
diff --git a/common/analysis/samplingNodeDefs.js b/common/analysis/samplingNodeDefs.js
index 308e78149e..f748c2f08c 100644
--- a/common/analysis/samplingNodeDefs.js
+++ b/common/analysis/samplingNodeDefs.js
@@ -84,8 +84,8 @@ const determinePlotAreaNodeDefs = ({ survey, chain }) => {
   const chainUuid = Chain.getUuid(chain)
   const cycleKeys = Survey.getCycleKeys(survey)
   const baseUnitNodeDef = Survey.getBaseUnitNodeDef({ chain })(survey)
-  const descentants = Survey.getDescendantsAndSelf({ nodeDef: baseUnitNodeDef })(survey)
-  const descendantEntities = descentants.filter(
+  const descendants = Survey.getNodeDefDescendantsAndSelf({ nodeDef: baseUnitNodeDef })(survey)
+  const descendantEntities = descendants.filter(
     (descendantEntity) =>
       NodeDef.isEntity(descendantEntity) && (NodeDef.isMultiple(descendantEntity) || NodeDef.isRoot(descendantEntity))
   )
diff --git a/common/model/db/tables/chain/select.js b/common/model/db/tables/chain/select.js
index 1662faad32..0aa4d400c6 100644
--- a/common/model/db/tables/chain/select.js
+++ b/common/model/db/tables/chain/select.js
@@ -1,5 +1,3 @@
-import * as Chain from '@common/analysis/chain'
-
 function _getSelectFields({ count, includeScript }) {
   if (count) {
     return ['count(*)']
@@ -14,7 +12,6 @@ function _getSelectFields({ count, includeScript }) {
  * Generate the select query for the processing_chain table by the given parameters.
  *
  * @param {!object} params - The query parameters.
- * @param {string} [params.cycle=null] - The survey cycle to filter by.
  * @param {string} [params.chainUuid=null] - The chain uuid to filter by.
  * @param {boolean} [params.count=false] - Whether to count.
  * @param {boolean} [params.includeScript=false] - Whether to include R scripts.
@@ -22,7 +19,7 @@ function _getSelectFields({ count, includeScript }) {
  * @returns {string} - The select query.
  */
 export function getSelect(params) {
-  const { cycle = null, chainUuid = null, count = false, includeScript = false } = params
+  const { chainUuid = null, count = false, includeScript = false } = params
 
   this.getSelectFields = _getSelectFields.bind(this)
 
@@ -31,7 +28,6 @@ export function getSelect(params) {
     FROM 
         ${this.nameAliased}
     
-    ${cycle ? `WHERE (${this.columnProps})->'${Chain.keysProps.cycles}' @> '"${cycle}"'` : ''}
     ${chainUuid ? `WHERE ${this.columnUuid} = '${chainUuid}'` : ''}
     `
 }
diff --git a/common/model/db/tables/dataNodeDef/columnNodeDef.js b/common/model/db/tables/dataNodeDef/columnNodeDef.js
index 2e94dfd813..a4d8c4b6d6 100644
--- a/common/model/db/tables/dataNodeDef/columnNodeDef.js
+++ b/common/model/db/tables/dataNodeDef/columnNodeDef.js
@@ -35,6 +35,7 @@ const colTypesGetterByType = {
   },
   [nodeDefType.date]: () => [SQL.types.date],
   [nodeDefType.decimal]: () => [SQL.types.decimal],
+  [nodeDefType.geo]: () => [SQL.types.varchar],
   [nodeDefType.entity]: () => [SQL.types.uuid],
   [nodeDefType.file]: () => [SQL.types.uuid, SQL.types.varchar],
   [nodeDefType.integer]: () => [SQL.types.bigint],
diff --git a/core/arrayUtils.js b/core/arrayUtils.js
index 4c90ce951a..47be5632f2 100644
--- a/core/arrayUtils.js
+++ b/core/arrayUtils.js
@@ -80,6 +80,11 @@ const sortByProps = (props) => (array) =>
     return 0
   })
 
+const toArray = (value) => {
+  if (Objects.isNil(value)) return value
+  return Array.isArray(value) ? value : [value]
+}
+
 export const ArrayUtils = {
   addOrRemoveItem,
   addIfNotEmpty,
@@ -91,4 +96,5 @@ export const ArrayUtils = {
   first,
   last,
   sortByProps,
+  toArray,
 }
diff --git a/core/expressionParser/helpers/functions.js b/core/expressionParser/helpers/functions.js
index e856d48385..dae33bd12c 100644
--- a/core/expressionParser/helpers/functions.js
+++ b/core/expressionParser/helpers/functions.js
@@ -4,6 +4,7 @@ export const functionNames = {
   count: 'count',
   distance: 'distance',
   first: 'first',
+  geoPolygon: 'geoPolygon',
   includes: 'includes',
   index: 'index',
   isEmpty: 'isEmpty',
diff --git a/core/i18n/resources/en/common.js b/core/i18n/resources/en/common.js
index ef35ab0a20..a48b5391f5 100644
--- a/core/i18n/resources/en/common.js
+++ b/core/i18n/resources/en/common.js
@@ -226,6 +226,12 @@ Do you want to proceed?`,
     pageNotFound: 'Page not found',
   },
 
+  geo: {
+    area: 'Area',
+    vertices: 'Vertices',
+    perimeter: 'Perimeter',
+  },
+
   files: {
     header: 'Files',
     missing: ' Missing files: {{count}}',
@@ -802,8 +808,8 @@ Merge cannot be performed.`,
   mapView: {
     createRecord: 'Create new record',
     editRecord: 'Edit record',
-    altitude: 'Altitude (m)',
     earthMap: 'Earth Map',
+    elevation: 'Elevation (m)',
     locationEditInfo: 'Double click on the map or drag the marker to update the location',
     locationUpdated: 'Location updated',
     options: {
@@ -1156,8 +1162,8 @@ $t(common.cantUndoWarning)`,
     invalid: 'Invalid expression: {{details}}',
     missingFunctionParameters: 'Missing function parameters',
     undefinedFunction: 'Undefined function: {{name}}',
-    functionHasTooFewArguments: 'Function {{fnName}} requires at least {{minArity}} (got {{numArgs}})',
-    functionHasTooManyArguments: 'Function {{fnName}} only accepts at most {{maxArity}} (got {{numArgs}})',
+    functionHasTooFewArguments: 'Function {{fnName}} requires at least {{minArity}} arguments (got {{numArgs}})',
+    functionHasTooManyArguments: 'Function {{fnName}} only accepts at most {{maxArity}} arguments (got {{numArgs}})',
   },
 
   // ====== Help views
@@ -1203,14 +1209,14 @@ $t(common.appNameFull)
       isEmpty: 'Returns true if the argument has no value specified',
       isNotEmpty: 'Returns true if the argument has some value specified',
       last: 'Returns the last value or node of the specified multiple attribute or entity',
-      ln: 'Take the natural logarithm of x',
-      log10: 'Take the base 10 logarithm of x',
-      max: 'Take the maximum of the arguments',
-      min: 'Take the minimum of the arguments',
+      ln: 'Returns the natural logarithm of X',
+      log10: 'Returns the base 10 logarithm of X',
+      max: 'Returns the maximum of the arguments',
+      min: 'Returns the minimum of the arguments',
       now: 'Returns the current date or time',
       parent: 'Returns the parent entity of the specified node',
-      pow: 'Raise a number X to the power P',
-      rowIndex: 'Gives the current row index',
+      pow: 'Returns the value of a base raised to a power',
+      rowIndex: 'Returns the current table row (or form) index',
       taxonProp: 'Returns the value of the specified $t(extraProp.label) of a taxon having the specified code',
       uuid: 'Generates a UUID (universally unique identifier) that can be used as identifier (e.g. as a key attribute of an enity)',
       // SQL functions
@@ -1223,6 +1229,10 @@ $t(common.appNameFull)
     },
     basicProps: {
       analysis: 'Analysis',
+      autoIncrementalKey: {
+        label: 'Auto incremental',
+        info: 'Value will be automatically generated',
+      },
       displayAs: 'Display as',
       displayIn: 'Display in',
       entitySource: 'Entity Source',
@@ -1247,6 +1257,7 @@ $t(common.appNameFull)
       areaBasedEstimate: 'Area-based estimate',
       defaultValues: 'Default values',
       defaultValueEvaluatedOneTime: 'Default value evaluated only one time',
+      defaultValuesNotEditableForAutoIncrementalKey: 'Default values not editable because auto incremental key is set',
       hidden: 'Hide in entry form',
       hiddenInMobile: 'Hidden in Arena Mobile',
       hiddenWhenNotRelevant: 'Hidden when not relevant',
@@ -1361,6 +1372,7 @@ E.g. this.region = region_attribute_name
       coordinate: 'Coordinate',
       date: 'Date',
       decimal: 'Decimal',
+      geo: 'Geospatial',
       entity: 'Table or form',
       file: 'File',
       integer: 'Integer',
@@ -1429,6 +1441,11 @@ $t(surveyForm.formEntryActions.confirmPromote)`,
       altitude: 'Altitude',
       altitudeAccuracy: 'Altitude accuracy',
     },
+    nodeDefGeo: {
+      confirmDelete: 'Delete this Geospatial value?',
+      geoJSON: 'GeoJSON',
+      invalidGeoJsonFileUploaded: 'Invalid GeoJSON file uploaded',
+    },
     nodeDefEntityForm: {
       addNewEntity: 'Add new {{name}}',
       confirmDelete: 'Are you sure you want to delete this entity?',
@@ -1446,6 +1463,10 @@ $t(surveyForm.formEntryActions.confirmPromote)`,
       fileUuid: 'File uuid',
       fileName: 'File name',
     },
+    nodeDefsTreeSelectMode: {
+      allNodeDefs: 'All nodes',
+      onlyPages: 'Only pages',
+    },
     step: {
       entry: 'Entry',
       cleansing: 'Cleansing',
diff --git a/core/numberUtils.js b/core/numberUtils.js
index 25991f975d..2e467d3b64 100644
--- a/core/numberUtils.js
+++ b/core/numberUtils.js
@@ -12,6 +12,39 @@ BigNumber.config({
   },
 })
 
+export const areaUnits = {
+  squareMeter: 'squareMeter',
+  squareFoot: 'squareFoot',
+  acre: 'acre',
+  hectare: 'hectare',
+}
+
+const areaUnitToSquareMetersConversionFactor = {
+  [areaUnits.acre]: 4046.85642199999983859016,
+  [areaUnits.hectare]: 10000,
+  [areaUnits.squareMeter]: 1,
+  [areaUnits.squareFoot]: 0.09290304,
+}
+
+export const lengthUnits = {
+  meter: 'meter',
+  foot: 'foot',
+}
+
+const lengthUnitToMetersConversionFactor = {
+  [lengthUnits.meter]: 1,
+  [lengthUnits.foot]: 0.3048,
+}
+
+export const abbreviationByUnit = {
+  [areaUnits.squareMeter]: 'm²',
+  [areaUnits.squareFoot]: 'ft²',
+  [areaUnits.acre]: 'ac',
+  [areaUnits.hectare]: 'ha',
+  [lengthUnits.meter]: 'm',
+  [lengthUnits.foot]: 'ft',
+}
+
 export const toNumber = (num) => (Objects.isEmpty(num) ? NaN : Number(num))
 
 export const isInteger = A.pipe(toNumber, Number.isInteger)
@@ -51,3 +84,16 @@ export const roundToPrecision = (value, precision = NaN) => {
  * @returns {string} - The formatted value or null if the value was null.
  */
 export const formatInteger = (value) => formatDecimal(value, 0)
+
+/**
+ * Returns the modulus of the specified value. The result will always be a positive number.
+ * @param {!number} modulus - The modulus to apply.
+ * @returns {number} - The result of the modulus (always positive or 0).
+ */
+export const mod = (modulus) => (value) => ((value % modulus) + modulus) % modulus
+
+export const squareMetersToUnit = (unit) => (value) =>
+  Objects.isNil(value) ? NaN : value / areaUnitToSquareMetersConversionFactor[unit]
+
+export const metersToUnit = (unit) => (value) =>
+  Objects.isNil(value) ? NaN : value / lengthUnitToMetersConversionFactor[unit]
diff --git a/core/objectUtils.js b/core/objectUtils.js
index 45a21e1ccd..4665f76794 100644
--- a/core/objectUtils.js
+++ b/core/objectUtils.js
@@ -104,6 +104,14 @@ export const setInPath =
 
 export const dissocTemporary = R.unless(R.isNil, R.dissoc(keys.temporary))
 
+export const keepNonEmptyProps = (obj) =>
+  Object.entries(obj).reduce((acc, [key, value]) => {
+    if (!isBlank(value)) {
+      acc[key] = value
+    }
+    return acc
+  }, {})
+
 // ====== UTILS / uuid
 const _getProp = (propNameOrExtractor) => (item) =>
   typeof propNameOrExtractor === 'string' ? R.path(propNameOrExtractor.split('.'))(item) : propNameOrExtractor(item)
diff --git a/core/processUtils.js b/core/processUtils.js
index 7677e48f1f..8498f96e91 100644
--- a/core/processUtils.js
+++ b/core/processUtils.js
@@ -74,6 +74,8 @@ const ENV = {
   fileStorageAwsSecretAccessKey: process.env.FILE_STORAGE_AWS_SECRET_ACCESS_KEY,
   fileStorageAwsS3BucketName: process.env.FILE_STORAGE_AWS_S3_BUCKET_NAME,
   fileStorageAwsS3BucketRegion: process.env.FILE_STORAGE_AWS_S3_BUCKET_REGION,
+  // Experimental features
+  experimentalFeatures: isTrue(process.env.EXPERIMENTAL_FEATURES),
 }
 
 module.exports = {
diff --git a/core/record/_record/recordNodeValueUpdater.js b/core/record/_record/recordNodeValueUpdater.js
index 389cef048f..207ff3e053 100644
--- a/core/record/_record/recordNodeValueUpdater.js
+++ b/core/record/_record/recordNodeValueUpdater.js
@@ -32,7 +32,10 @@ export const updateAttributeValue = ({
     const attributeUpdated = A.pipe(
       Node.assocValue(value),
       Node.assocUpdated(true),
-      Node.assocDateModified(dataModifiedParam ?? new Date())
+      Node.assocDateModified(dataModifiedParam ?? new Date()),
+      (nodeUpdated) =>
+        // reset defaultValueApplied meta information
+        Node.isDefaultValueApplied(attribute) ? Node.assocIsDefaultValueApplied(false)(nodeUpdated) : nodeUpdated
     )(attribute)
 
     const updateResult = new RecordUpdateResult({ record })
diff --git a/core/record/_record/recordNodesUpdater.js b/core/record/_record/recordNodesUpdater.js
index dd35570f6e..314b3437ec 100644
--- a/core/record/_record/recordNodesUpdater.js
+++ b/core/record/_record/recordNodesUpdater.js
@@ -3,7 +3,6 @@ import {
   RecordUpdater as CoreRecordUpdater,
   RecordNodesUpdater as CoreRecordNodesUpdater,
   RecordUpdateResult,
-  Promises,
 } from '@openforis/arena-core'
 
 import * as Survey from '@core/survey/survey'
@@ -234,7 +233,7 @@ const updateAttributesInEntityWithValues =
     )
 
     // update attribute values
-    await Promises.each(valuesByDefUuidEntriesInDescendantAttributes, async ([attributeDefUuid, value]) => {
+    for await (const [attributeDefUuid, value] of valuesByDefUuidEntriesInDescendantAttributes) {
       const attributeDef = Survey.getNodeDefByUuid(attributeDefUuid)(survey)
 
       const { record: currentRecord } = updateResult
@@ -254,7 +253,7 @@ const updateAttributesInEntityWithValues =
       })(currentRecord)
 
       await updateDependentNodes(attributeUpdateResult)
-    })
+    }
     return updateResult
   }
 
diff --git a/core/survey/_survey/surveyNodeDefs.js b/core/survey/_survey/surveyNodeDefs.js
index 5bbe23fc64..5b47a1c0d8 100644
--- a/core/survey/_survey/surveyNodeDefs.js
+++ b/core/survey/_survey/surveyNodeDefs.js
@@ -311,16 +311,17 @@ export const getNodeDefPath =
   }
 
 export const getHierarchy =
-  (filterFn = NodeDef.isEntity) =>
+  (filterFn = NodeDef.isEntity, cycle = undefined) =>
   (survey) => {
     let length = 1
     const h = (array, nodeDef) => {
-      const childDefs = [
-        ...(NodeDef.isEntity(nodeDef) && !NodeDef.isVirtual(nodeDef)
-          ? R.pipe(getNodeDefChildren(nodeDef), R.filter(filterFn))(survey)
-          : []),
-      ]
-
+      const childDefs = []
+      if (NodeDef.isEntity(nodeDef) && !NodeDef.isVirtual(nodeDef)) {
+        const childDefsNotFiltered = cycle
+          ? getNodeDefChildrenSorted({ nodeDef, cycle })(survey)
+          : getNodeDefChildren(nodeDef)(survey)
+        childDefs.push(...childDefsNotFiltered.filter(filterFn))
+      }
       length += childDefs.length
       const item = { ...nodeDef, children: childDefs.reduce(h, []) }
       array.push(item)
@@ -350,7 +351,7 @@ export const traverseHierarchyItemSync = (nodeDefItem, visitorFn, depth = 0) =>
 }
 
 export const visitDescendantsAndSelf =
-  ({ visitorFn, nodeDef = null, cycle = null, traverseMethod = TraverseMethod.bfs }) =>
+  ({ nodeDef = null, cycle = null, visitorFn, traverseMethod = TraverseMethod.bfs }) =>
   (survey) => {
     const nodeDefToVisit = nodeDef ?? getNodeDefRoot(survey)
     return Surveys.visitDescendantsAndSelfNodeDef({
@@ -377,22 +378,18 @@ export const findDescendants =
     return descendants
   }
 
-export const getDescendantsAndSelf =
-  ({ nodeDef = null }) =>
+export const getNodeDefDescendantsAndSelf =
+  ({ nodeDef = null, cycle = null, traverseMethod = TraverseMethod.bfs } = {}) =>
   (survey) => {
     const descendants = []
-    const queue = new Queue()
-
-    queue.enqueue(nodeDef || getNodeDefRoot(survey))
-
-    while (!queue.isEmpty()) {
-      const nodeDefCurrent = queue.dequeue()
-
-      descendants.push(nodeDefCurrent)
-
-      const childrenDefs = getNodeDefChildren(nodeDefCurrent)(survey)
-      queue.enqueueItems(childrenDefs)
-    }
+    visitDescendantsAndSelf({
+      nodeDef,
+      cycle,
+      visitorFn: (visitedNodeDef) => {
+        descendants.push(visitedNodeDef)
+      },
+      traverseMethod,
+    })(survey)
     return descendants
   }
 
diff --git a/core/survey/nodeDef.js b/core/survey/nodeDef.js
index b3d93d0941..9d746837e7 100644
--- a/core/survey/nodeDef.js
+++ b/core/survey/nodeDef.js
@@ -52,6 +52,7 @@ export const propKeys = {
   descriptions: ObjectUtils.keysProps.descriptions,
   enumerate: 'enumerate', // only for multiple entities
   key: 'key',
+  autoIncrementalKey: 'autoIncrementalKey',
   labels: ObjectUtils.keysProps.labels,
   multiple: 'multiple',
   name: ObjectUtils.keys.name,
@@ -175,6 +176,17 @@ export const visibleFieldsDefaultByType = {
   [nodeDefType.taxon]: [valuePropsTaxon.code, valuePropsTaxon.scientificName, valuePropsTaxon.vernacularName],
 }
 
+export const createAutoIncrementalKeyDefaultValues = ({ nodeDef, nodeDefParent }) => {
+  const nodeDefName = getName(nodeDef)
+  const nodeDefParentName = getName(nodeDefParent)
+  return [
+    NodeDefExpression.createExpression({ expression: '1', applyIf: 'index($context) == 0' }),
+    NodeDefExpression.createExpression({
+      expression: `Math.max(parent($context).${nodeDefParentName}.${nodeDefName}) + 1`,
+    }),
+  ]
+}
+
 // ==== READ
 
 export const {
@@ -197,6 +209,7 @@ export const getName = getProp(propKeys.name, '')
 export const getCycles = getProp(propKeys.cycles, [])
 
 export const isKey = ObjectUtils.isPropTrue(propKeys.key)
+export const isAutoIncrementalKey = ObjectUtils.isPropTrue(propKeys.autoIncrementalKey)
 export const isRoot = R.pipe(getParentUuid, R.isNil)
 export const isMultiple = ObjectUtils.isPropTrue(propKeys.multiple)
 export const isSingle = R.pipe(isMultiple, R.not)
@@ -221,6 +234,7 @@ export const isCode = isType(nodeDefType.code)
 export const isCoordinate = isType(nodeDefType.coordinate)
 export const isDate = isType(nodeDefType.date)
 export const isDecimal = isType(nodeDefType.decimal)
+export const isGeo = isType(nodeDefType.geo)
 export const isFile = isType(nodeDefType.file)
 export const isInteger = isType(nodeDefType.integer)
 export const isTaxon = isType(nodeDefType.taxon)
@@ -453,6 +467,10 @@ export const mergePropsAdvanced = (propsAdvanced) => (nodeDef) =>
   R.pipe(getPropsAdvanced, R.mergeLeft(propsAdvanced), (propsAdvancedUpdated) =>
     assocPropsAdvanced(propsAdvancedUpdated, nodeDef)
   )(nodeDef)
+export const assocDefaultValues = (defaultValues) =>
+  mergePropsAdvanced({ [keysPropsAdvanced.defaultValues]: defaultValues })
+export const assocDefaultValueEvaluatedOnlyOneTime = (evaluatedOnlyOneTime) =>
+  mergePropsAdvanced({ [keysPropsAdvanced.defaultValueEvaluatedOneTime]: evaluatedOnlyOneTime })
 export const assocValidations = (validations) => mergePropsAdvanced({ [keysPropsAdvanced.validations]: validations })
 export const dissocTemporary = R.dissoc(keys.temporary)
 export const assocProp = ({ key, value }) =>
@@ -498,7 +516,10 @@ export const convertToType =
   ({ toType }) =>
   (nodeDef) => {
     const propsUpdated = R.pick(commonAttributePropsKeys)(getProps(nodeDef))
-    const propsAdvancedUpdated = R.pick(commonAttributePropsAdvancedKeys)(getPropsAdvanced(nodeDef))
+    const propsAdvancedToKeep = isAutoIncrementalKey(nodeDef)
+      ? commonAttributePropsAdvancedKeys.filter((prop) => prop !== keysPropsAdvanced.defaultValues)
+      : commonAttributePropsAdvancedKeys
+    const propsAdvancedUpdated = R.pick(propsAdvancedToKeep)(getPropsAdvanced(nodeDef))
 
     const layout = getLayout(nodeDef)
     const layoutUpdated = Object.entries(layout).reduce((acc, [cycleKey, cycleLayout]) => {
@@ -598,6 +619,7 @@ export const canHaveDefaultValue = (nodeDef) =>
     nodeDefType.coordinate,
     nodeDefType.date,
     nodeDefType.decimal,
+    nodeDefType.geo,
     nodeDefType.integer,
     nodeDefType.taxon,
     nodeDefType.text,
@@ -653,3 +675,18 @@ export const clearNotApplicableProps = (cycle) => (nodeDef) => {
 
 export const canHaveMobileProps = (cycle) => (nodeDef) =>
   canBeHiddenInMobile(nodeDef) || canIncludeInMultipleEntitySummary(cycle)(nodeDef)
+
+export const canHaveAutoIncrementalKey = ({ nodeDef, nodeDefParent }) => {
+  if (!isKey(nodeDef) || !isInteger(nodeDef)) return false
+
+  const defaultValues = getDefaultValues(nodeDef)
+  if (defaultValues.length === 0) return true
+
+  const autoIncrementalDefaultValues = createAutoIncrementalKeyDefaultValues({ nodeDef, nodeDefParent })
+  return (
+    defaultValues.length === autoIncrementalDefaultValues.length &&
+    autoIncrementalDefaultValues.every((defaultValue, index) =>
+      NodeDefExpression.isSimilarTo(defaultValue)(defaultValues[index])
+    )
+  )
+}
diff --git a/core/survey/nodeDefExpression.js b/core/survey/nodeDefExpression.js
index 3b9330a706..ab532ad477 100644
--- a/core/survey/nodeDefExpression.js
+++ b/core/survey/nodeDefExpression.js
@@ -53,6 +53,16 @@ export const isPlaceholder = R.propEq(keys.placeholder, true)
 export const isEmpty = (expression = {}) =>
   StringUtils.isBlank(getExpression(expression)) && StringUtils.isBlank(getApplyIf(expression))
 
+export const isSimilarTo = (expressionA) => (expressionB) => {
+  if (isEmpty(expressionA) && isEmpty(expressionB)) return true
+  if (isEmpty(expressionA) || isEmpty(expressionB)) return false
+  const prepareExpr = (expr) => StringUtils.removeSuffix('\n')(expr.replaceAll(' ', ''))
+  return (
+    prepareExpr(getExpression(expressionA)) === prepareExpr(getExpression(expressionB)) &&
+    prepareExpr(getApplyIf(expressionA)) === prepareExpr(getApplyIf(expressionB))
+  )
+}
+
 // ====== UPDATE
 
 const assocProp = (propName, value) => R.pipe(R.assoc(propName, value), R.dissoc(keys.placeholder))
diff --git a/core/survey/nodeDefType.js b/core/survey/nodeDefType.js
index 631625d827..432bd82c3b 100644
--- a/core/survey/nodeDefType.js
+++ b/core/survey/nodeDefType.js
@@ -7,6 +7,7 @@ export const nodeDefType = {
   boolean: 'boolean',
   code: 'code',
   coordinate: 'coordinate',
+  geo: 'geo',
   taxon: 'taxon',
   file: 'file',
   entity: 'entity',
diff --git a/core/survey/survey.js b/core/survey/survey.js
index 87a7033cfb..c8650811eb 100644
--- a/core/survey/survey.js
+++ b/core/survey/survey.js
@@ -184,9 +184,9 @@ export const {
   getHierarchy,
   traverseHierarchyItem,
   traverseHierarchyItemSync,
-  getDescendantsAndSelf,
   visitDescendantsAndSelf,
   findDescendants,
+  getNodeDefDescendantsAndSelf,
   getNodeDefDescendantsInSingleEntities,
   getNodeDefDescendantAttributesInSingleEntities,
   getNodeDefAncestorMultipleEntity,
diff --git a/package.json b/package.json
index 69f75a0196..b49863f60d 100644
--- a/package.json
+++ b/package.json
@@ -100,17 +100,23 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.521.0",
+    "@codemirror/autocomplete": "^6.18.0",
+    "@codemirror/lang-javascript": "^6.2.2",
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
     "@mui/material": "^6.0.0",
     "@mui/x-data-grid": "^7.14.0",
     "@mui/x-date-pickers": "^7.14.0",
     "@mui/x-tree-view": "^7.7.1",
-    "@openforis/arena-core": "^0.0.203",
+    "@openforis/arena-core": "^0.0.204",
     "@openforis/arena-server": "^0.1.34",
     "@reduxjs/toolkit": "^2.2.5",
     "@sendgrid/mail": "^8.1.3",
     "@shopify/draggable": "^1.1.3",
+    "@uiw/react-codemirror": "^4.23.0",
+    "@turf/area": "^7.1.0",
+    "@turf/centroid": "^7.1.0",
+    "@turf/length": "^7.1.0",
     "ace-builds": "^1.32.6",
     "adm-zip": "^0.5.10",
     "archiver": "^7.0.1",
@@ -122,7 +128,7 @@
     "circle-to-polygon": "^2.2.0",
     "classnames": "^2.5.1",
     "cluster": "^0.7.7",
-    "codemirror": "^5.65.5",
+    "codemirror": "^6.0.1",
     "csv": "^6.3.9",
     "d3": "^7.9.0",
     "dotenv": "^16.4.5",
diff --git a/server/modules/analysis/api/chainApi.js b/server/modules/analysis/api/chainApi.js
index 6e8f13d175..ee3d41ad8b 100644
--- a/server/modules/analysis/api/chainApi.js
+++ b/server/modules/analysis/api/chainApi.js
@@ -14,10 +14,10 @@ export const init = (app) => {
 
   app.post('/survey/:surveyId/chain/', AuthMiddleware.requireRecordAnalysisPermission, async (req, res, next) => {
     try {
-      const { cycle, surveyId } = Request.getParams(req)
+      const { surveyId } = Request.getParams(req)
       const user = Request.getUser(req)
 
-      const chain = await AnalysisService.create({ user, surveyId, cycle })
+      const chain = await AnalysisService.create({ user, surveyId })
 
       res.json(chain)
     } catch (error) {
@@ -32,9 +32,9 @@ export const init = (app) => {
     AuthMiddleware.requireRecordAnalysisPermission,
     async (req, res, next) => {
       try {
-        const { surveyId, surveyCycleKey: cycle, offset, limit } = Request.getParams(req)
+        const { surveyId, offset, limit } = Request.getParams(req)
 
-        const list = await AnalysisService.fetchChains({ surveyId, cycle, offset, limit })
+        const list = await AnalysisService.fetchChains({ surveyId, offset, limit })
 
         res.json({ list })
       } catch (error) {
@@ -48,9 +48,9 @@ export const init = (app) => {
     AuthMiddleware.requireRecordAnalysisPermission,
     async (req, res, next) => {
       try {
-        const { surveyId, surveyCycleKey: cycle } = Request.getParams(req)
+        const { surveyId } = Request.getParams(req)
 
-        const count = await AnalysisService.countChains({ surveyId, cycle })
+        const count = await AnalysisService.countChains({ surveyId })
 
         res.json({ count })
       } catch (error) {
diff --git a/server/modules/analysis/manager/chain/index.js b/server/modules/analysis/manager/chain/index.js
index 21050ef8cd..0badd579b2 100644
--- a/server/modules/analysis/manager/chain/index.js
+++ b/server/modules/analysis/manager/chain/index.js
@@ -28,27 +28,26 @@ export const insertChain = async ({ user, surveyId, chain }, client = DB.client)
     return chainDb
   })
 
-export const create = async ({ user, surveyId, cycle }) => {
-  let newChain = ChainFactory.createInstance({ cycles: [cycle] })
-
+export const create = async ({ user, surveyId }) => {
   const survey = await SurveyManager.fetchSurveyAndNodeDefsBySurveyId({ surveyId, draft: true, advanced: true })
-  const defaultLang = Survey.getDefaultLanguage(Survey.getSurveyInfo(survey))
-  const validation = await ChainValidator.validateChain({ chain: newChain, defaultLang, survey })
+  const surveyInfo = Survey.getSurveyInfo(survey)
+  const cycles = Survey.getCycleKeys(surveyInfo)
+  const defaultLang = Survey.getDefaultLanguage(surveyInfo)
 
-  newChain = Chain.assocValidation(validation)(newChain)
+  let chain = ChainFactory.createInstance({ cycles })
 
-  return insertChain({
-    surveyId,
-    user,
-    chain: newChain,
-  })
+  const validation = await ChainValidator.validateChain({ chain, defaultLang, survey })
+
+  chain = Chain.assocValidation(validation)(chain)
+
+  return insertChain({ surveyId, user, chain })
 }
 
 // ====== READ
 export const { countChains, fetchChains, fetchChain } = ChainRepository
 
 // ====== UPDATE
-export const { updateChain, removeChainCycles } = ChainRepository
+export const { updateChain } = ChainRepository
 
 export const updateChainStatusExec = async ({ user, surveyId, chainUuid, statusExec }) =>
   DB.client.tx(async (tx) => {
@@ -101,28 +100,26 @@ export const persistChain = async ({ user, surveyId, chain }, client) => {
 
 // ====== DELETE
 
-export const _deleteChain = async ({ user, surveyId, chainUuid = false, noCycle = false }, client = DB.client) => {
-  const deletedChains = await ChainRepository.deleteChain({ surveyId, chainUuid, noCycle }, client)
-
-  const deletedChainsUuids = deletedChains.map(Chain.getUuid)
+export const _deleteChain = async ({ user, surveyId, chainUuid }, client = DB.client) => {
+  const deletedChain = await ChainRepository.deleteChain({ surveyId, chainUuid }, client)
+  const deletedChainUuid = Chain.getUuid(deletedChain)
   const survey = await SurveyManager.fetchSurveyAndNodeDefsBySurveyId(
     { surveyId, draft: true, advanced: true, includeAnalysis: true },
     (client = DB.client)
   )
 
   const nodeDefsUuidsInDeleteChains = Survey.getNodeDefsArray(survey)
-    .filter((_nodeDef) => deletedChainsUuids.includes(NodeDef.getChainUuid(_nodeDef)))
+    .filter((_nodeDef) => deletedChainUuid === NodeDef.getChainUuid(_nodeDef))
     .map(NodeDef.getUuid)
 
   await NodeDefService.markNodeDefsDeleted({ user, surveyId, nodeDefUuids: nodeDefsUuidsInDeleteChains }, client)
 
-  return deletedChains
+  return deletedChain
 }
 
 export const deleteChain = async ({ user, surveyId, chainUuid }, client = DB.client) =>
   client.tx(async (tx) => {
-    const deletedChains = await _deleteChain({ user, surveyId, chainUuid }, tx)
-    const deletedChain = deletedChains[0]
+    const deletedChain = await _deleteChain({ user, surveyId, chainUuid }, tx)
 
     const content = {
       [ActivityLog.keysContent.uuid]: chainUuid,
@@ -133,6 +130,3 @@ export const deleteChain = async ({ user, surveyId, chainUuid }, client = DB.cli
       markSurveyDraft(surveyId, tx),
     ])
   })
-
-export const deleteChainWithoutCycle = async ({ surveyId }, client = DB.client) =>
-  client.tx(async (tx) => _deleteChain({ surveyId, noCycle: true }, tx))
diff --git a/server/modules/analysis/manager/index.js b/server/modules/analysis/manager/index.js
index e68457cd53..8eb646dd3f 100644
--- a/server/modules/analysis/manager/index.js
+++ b/server/modules/analysis/manager/index.js
@@ -1,14 +1,4 @@
 // ====== Chain
-export {
-  create,
-  countChains,
-  fetchChains,
-  fetchChain,
-  updateChain,
-  updateChainStatusExec,
-  removeChainCycles,
-  deleteChain,
-  deleteChainWithoutCycle,
-} from './chain'
+export { create, countChains, fetchChains, fetchChain, updateChain, updateChainStatusExec, deleteChain } from './chain'
 
 export { cleanChains } from './chainsCleanManager'
diff --git a/server/modules/analysis/repository/chain/delete.js b/server/modules/analysis/repository/chain/delete.js
index 14adfe755d..589dc51784 100644
--- a/server/modules/analysis/repository/chain/delete.js
+++ b/server/modules/analysis/repository/chain/delete.js
@@ -1,5 +1,3 @@
-import * as Chain from '@common/analysis/chain'
-
 import * as DB from '../../../../db'
 
 import { TableChain } from '../../../../../common/model/db'
@@ -9,26 +7,21 @@ import { TableChain } from '../../../../../common/model/db'
  *
  * @param {!object} params - The query parameters.
  * @param {!string} params.surveyId - The survey id.
- * @param {string} [params.chainUuid=null] - The chain uuid to delete.
- * @param {boolean} [params.noCycle=false] - Whether to delete chains with no cycles.
+ * @param {!string} [params.chainUuid] - The chain uuid to delete.
  * @param {pgPromise.IDatabase} [client=db] - The database client.
  *
  * @returns {Promise<any[]>} - The result promise.
  */
 export const deleteChain = async (params, client = DB.client) => {
-  const { surveyId, chainUuid = null, noCycle = false } = params
-
-  if (!chainUuid && !noCycle)
-    throw new Error(`One between chainUuid and noCycle are required. {chainUuid:${chainUuid}, noCycle:${noCycle}}`)
+  const { surveyId, chainUuid } = params
 
   const tableChain = new TableChain(surveyId)
 
-  return client.any(
+  return client.one(
     `DELETE FROM ${tableChain.nameQualified}
-    WHERE 
-    ${chainUuid ? TableChain.columnSet.uuid : `jsonb_array_length(props->'${Chain.keysProps.cycles}')`} = $1
+    WHERE ${TableChain.columnSet.uuid} = $1
     RETURNING *`,
-    chainUuid ? [chainUuid] : [0],
+    [chainUuid],
     DB.transformCallback
   )
 }
diff --git a/server/modules/analysis/repository/chain/index.js b/server/modules/analysis/repository/chain/index.js
index ec11ead77a..6aeacecdc5 100644
--- a/server/modules/analysis/repository/chain/index.js
+++ b/server/modules/analysis/repository/chain/index.js
@@ -3,6 +3,6 @@ export { insertMany } from './insert'
 
 export { countChains, fetchChains, fetchChain } from './read'
 
-export { updateChain, removeChainCycles } from './update'
+export { updateChain } from './update'
 
 export { deleteChain } from './delete'
diff --git a/server/modules/analysis/repository/chain/read.js b/server/modules/analysis/repository/chain/read.js
index a161760bbf..21e16bd3ea 100644
--- a/server/modules/analysis/repository/chain/read.js
+++ b/server/modules/analysis/repository/chain/read.js
@@ -13,27 +13,25 @@ export const transformCallback = (row) => {
 }
 
 /**
- * Count the processing chains by the given survey id and the optional survey cycle.
+ * Count the processing chains by the given survey id.
  *
  * @param {!object} params - The query parameters.
  * @param {!string} params.surveyId - The survey id.
- * @param {string} [params.cycle=null] - The survey cycle.
  * @param {BaseProtocol} [client=db] - The database client.
  *
  * @returns {Promise<number>} - The result promise.
  */
 export const countChains = async (params, client = DB.client) => {
-  const { surveyId, cycle = null } = params
+  const { surveyId } = params
   const tableChain = new TableChain(surveyId)
-  return client.one(`${tableChain.getSelect({ surveyId, cycle, count: true })}`, [], (row) => Number(row.count))
+  return client.one(`${tableChain.getSelect({ surveyId, count: true })}`, [], (row) => Number(row.count))
 }
 
 /**
- * Fetches all processing chains by the given survey id and the optional survey cycle.
+ * Fetches all processing chains by the given survey id.
  *
  * @param {!object} params - The query parameters.
  * @param {!string} params.surveyId - The survey id.
- * @param {string} [params.cycle=null] - The survey cycle.
  * @param {number} [params.offset=0] - The select query offset.
  * @param {number} [params.limit=null] - The select query limit.
  * @param {boolean} [params.includeScript=false] - Whether to include the R scripts.
@@ -42,12 +40,12 @@ export const countChains = async (params, client = DB.client) => {
  * @returns {Promise<any[]>} - The result promise.
  */
 export const fetchChains = async (params, client = DB.client) => {
-  const { surveyId, cycle = null, offset = 0, limit = null, includeScript = false } = params
+  const { surveyId, offset = 0, limit = null, includeScript = false } = params
 
   const tableChain = new TableChain(surveyId)
 
   return client.map(
-    `${tableChain.getSelect({ surveyId, cycle, includeScript })}
+    `${tableChain.getSelect({ surveyId, includeScript })}
     ORDER BY ${tableChain.columnDateCreated} DESC
     LIMIT ${limit || 'ALL'}
     OFFSET ${offset}`,
diff --git a/server/modules/analysis/repository/chain/update.js b/server/modules/analysis/repository/chain/update.js
index 0375b59bfb..06acf2bc3b 100644
--- a/server/modules/analysis/repository/chain/update.js
+++ b/server/modules/analysis/repository/chain/update.js
@@ -1,6 +1,5 @@
 import * as DB from '../../../../db'
 
-import * as Chain from '@common/analysis/chain'
 import { TableChain } from '../../../../../common/model/db'
 
 /**
@@ -9,7 +8,7 @@ import { TableChain } from '../../../../../common/model/db'
  * @param {!object} params - The query parameters.
  * @param {!string} params.surveyId - The survey id.
  * @param {!string} params.chainUuid - The processing chain uuid.
- * @param {Object<string, any>} [params.fields={}] - A <key, value> object containing the fields to update.
+ * @param {{[key:string]: any}} [params.fields={}] - A <key, value> object containing the fields to update.
  * @param {boolean} [params.dateExecuted=false] - Whether to update date executed to current time.
  * @param {boolean} [params.dateModified=false] - Whether to update date modified to current time.
  * @param {pgPromise.IDatabase} [client=db] - The database client.
@@ -41,23 +40,3 @@ export const updateChain = async (params, client = DB.client) => {
     [chainUuid, ...Object.values(fields)]
   )
 }
-
-/**
- * Remove survey cycles from all processing chains.
- *
- * @param {!object} params - The query parameters.
- * @param {!string} params.surveyId - The survey id.
- * @param {!Array.<string>} params.cycles - The cycles to remove.
- * @param {pgPromise.IDatabase} [client=db] - The database client.
- *
- * @returns {Promise<null>} - The result promise.
- */
-export const removeChainCycles = async (params, client) => {
-  const { surveyId, cycles } = params
-  const tableChain = new TableChain(surveyId)
-  return client.none(
-    `UPDATE ${tableChain.nameQualified}
-  SET ${TableChain.columnSet.props} = jsonb_set(${TableChain.columnSet.props}, '{${Chain.keysProps.cycles}}',
-    (${TableChain.columnSet.props}->'${Chain.keysProps.cycles}') ${cycles.map((cycle) => `- '${cycle}'`).join(' ')})`
-  )
-}
diff --git a/server/modules/analysis/service/chainSummaryGenerator.js b/server/modules/analysis/service/chainSummaryGenerator.js
index 3fba57e9c1..f672bc9dd6 100644
--- a/server/modules/analysis/service/chainSummaryGenerator.js
+++ b/server/modules/analysis/service/chainSummaryGenerator.js
@@ -159,7 +159,6 @@ const generateChainSummary = async ({ surveyId, chainUuid, cycle, lang: langPara
     label: Chain.getLabel(lang, defaultLang)(chain),
     selectedLanguage: lang,
     selectedCycle: getCycleLabel(cycle),
-    cycles: Chain.getCycles(chain).map(getCycleLabel),
     samplingDesign: Chain.hasSamplingDesign(chain),
     baseUnit: NodeDef.getName(baseUnitNodeDef),
     baseUnitEntityKeys,
diff --git a/server/modules/collectImport/service/collectImport/metaImportJobs/nodeDefsImportJob/collectExpressionConverter.js b/server/modules/collectImport/service/collectImport/metaImportJobs/nodeDefsImportJob/collectExpressionConverter.js
index b1d9403970..d24f664dbd 100644
--- a/server/modules/collectImport/service/collectImport/metaImportJobs/nodeDefsImportJob/collectExpressionConverter.js
+++ b/server/modules/collectImport/service/collectImport/metaImportJobs/nodeDefsImportJob/collectExpressionConverter.js
@@ -109,6 +109,7 @@ const convert = ({ survey, nodeDefCurrent, expression, advancedExpressionEditor
     // geo namespace
     // idm:distance is deprecated in Collect
     { pattern: '(geo|idm):distance', replace: 'distance' },
+    { pattern: 'geo:polygon', replace: 'geoPolygon' },
     // math namespace
     { pattern: /math:PI\(\)/, replace: 'Math.PI' },
     // convert directly some functions from math:fnName to Math.fnName
diff --git a/server/modules/geo/api/geoApi.js b/server/modules/geo/api/geoApi.js
index a12aa925cb..5bb00bb0e0 100644
--- a/server/modules/geo/api/geoApi.js
+++ b/server/modules/geo/api/geoApi.js
@@ -14,8 +14,8 @@ import { PlanetApi } from './planetApi'
 const uriPrefix = '/survey/:surveyId/geo/'
 const whispApiUrl = 'https://whisp.openforis.org/api/'
 
-// free altitude API urls
-const altitudeApiUrls = [
+// free elevation API urls
+const elevationApiUrls = [
   ({ lat, lng }) => `https://api.opentopodata.org/v1/aster30m?locations=${lat},${lng}`,
   ({ lat, lng }) => `https://api.open-elevation.com/api/v1/lookup?locations=${lat},${lng}`,
 ]
@@ -78,20 +78,20 @@ export const init = (app) => {
     }
   )
 
-  app.get(`${uriPrefix}map/altitude`, AuthMiddleware.requireMapUsePermission, async (req, res) => {
+  app.get(`${uriPrefix}map/elevation`, AuthMiddleware.requireMapUsePermission, async (req, res) => {
     const { lat, lng } = Request.getParams(req)
-    let altitude = null
-    await Promises.each(altitudeApiUrls, async (urlPattern) => {
-      if (!Objects.isEmpty(altitude)) return
+    let elevation = null
+    await Promises.each(elevationApiUrls, async (urlPattern) => {
+      if (!Objects.isEmpty(elevation)) return
       try {
         const url = urlPattern({ lat, lng })
         const { data } = await axios.get(url, { timeout: 10000 })
-        altitude = data?.results?.[0]?.elevation
+        elevation = data?.results?.[0]?.elevation
       } catch (error) {
         // ignore it
       }
     })
-    res.json(altitude)
+    res.json(elevation)
   })
 
   app.get(`${uriPrefix}map/wmts/capabilities`, AuthMiddleware.requireMapUsePermission, async (req, res, next) => {
diff --git a/server/modules/record/manager/_recordManager/recordValidationManager.js b/server/modules/record/manager/_recordManager/recordValidationManager.js
index f04f7417b2..1479f4a529 100644
--- a/server/modules/record/manager/_recordManager/recordValidationManager.js
+++ b/server/modules/record/manager/_recordManager/recordValidationManager.js
@@ -46,7 +46,7 @@ export const validateNodesAndPersistValidation = async (survey, record, nodes, v
   // 1. validate node values
   const nodesValueValidation = await RecordValidator.validateNodes({ survey, record, nodes })
   const nodesValueValidationsByUuid = Validation.getFieldValidations(nodesValueValidation)
-  // 1.a. workaraound: always define value field validation even when validation is valid to allow cleaning up errors later
+  // 1.a. workaround: always define value field validation even when validation is valid to allow cleaning up errors later
   Object.entries(nodesValueValidationsByUuid).forEach(([nodeUuid, nodeValueValidation]) => {
     if (Validation.isValid(nodeValueValidation)) {
       const nodeValueValidationUpdated = Validation.setField('value', Validation.newInstance())(nodeValueValidation)
diff --git a/server/modules/record/service/recordService.js b/server/modules/record/service/recordService.js
index aa3cf99858..3fa761458b 100644
--- a/server/modules/record/service/recordService.js
+++ b/server/modules/record/service/recordService.js
@@ -416,7 +416,7 @@ export const generateNodeFileNameForDownload = async ({ surveyId, nodeUuid, file
           const keyValuesFormatted = ancestorKeyDefs.map((keyDef, index) => {
             const keyValue = ancestorKeyValues[index]
             const keyValueFormatted = NodeValueFormatter.format({ survey, nodeDef: keyDef, value: keyValue })
-            return keyValueFormatted
+            return encodeURIComponent(keyValueFormatted)
           })
           fileNameParts.unshift(keyValuesFormatted.join('_'))
         }
diff --git a/server/modules/survey/service/publish/jobs/chainsCyclesCheckJob.js b/server/modules/survey/service/publish/jobs/chainsCyclesCheckJob.js
index e6769f78b9..cff1a0ab10 100644
--- a/server/modules/survey/service/publish/jobs/chainsCyclesCheckJob.js
+++ b/server/modules/survey/service/publish/jobs/chainsCyclesCheckJob.js
@@ -6,7 +6,6 @@ import * as Survey from '@core/survey/survey'
 
 import * as SurveyManager from '@server/modules/survey/manager/surveyManager'
 import * as NodeDefManager from '@server/modules/nodeDef/manager/nodeDefManager'
-import * as AnalysisManager from '@server/modules/analysis/manager'
 
 export default class ChainsCyclesCheckJob extends Job {
   constructor(params) {
@@ -14,23 +13,10 @@ export default class ChainsCyclesCheckJob extends Job {
   }
 
   async execute() {
-    this.total = 3
-
     const { surveyId, tx } = this
-    const { cycleKeys, cycleKeysDeleted = [] } = await this._getCycleKeys()
+    const { cycleKeys } = await this._getCycleKeys()
     // 1. set all survey cycles to all nodeDef analysis
     await NodeDefManager.updateNodeDefAnalysisCycles(surveyId, cycleKeys, tx)
-    this.incrementProcessedItems()
-
-    // 2. dissoc deleted survey cycles from processing chains
-    if (!R.isEmpty(cycleKeysDeleted)) {
-      await AnalysisManager.removeChainCycles({ surveyId, cycles: cycleKeysDeleted }, tx)
-    }
-    this.incrementProcessedItems()
-
-    // 3. delete processing chains with no cycles
-    await AnalysisManager.deleteChainWithoutCycle({ surveyId }, tx)
-    this.incrementProcessedItems()
   }
 
   async _getCycleKeys() {
diff --git a/server/utils/exportFileNameGenerator.js b/server/utils/exportFileNameGenerator.js
index 9403b94a0c..5d5c3c050e 100644
--- a/server/utils/exportFileNameGenerator.js
+++ b/server/utils/exportFileNameGenerator.js
@@ -5,11 +5,20 @@ import { RecordCycle } from '@core/record/recordCycle'
 import * as DateUtils from '@core/dateUtils'
 
 const generate = ({ survey, fileType, cycle, itemName = null, extension = 'csv', includeTimestamp = false }) => {
-  const surveyName = Survey.getName(survey)
-  const cyclePart = Objects.isEmpty(cycle) ? '' : `_${`(cycle-${RecordCycle.getLabel(cycle)})`}`
-  const itemNamePart = itemName ? `_${itemName}` : ''
-  const timestampPart = includeTimestamp ? `_${DateUtils.nowFormatDefault()}` : ''
-  return `${surveyName}${cyclePart}${itemNamePart}_${fileType}${timestampPart}.${extension}`
+  const parts = [Survey.getName(survey)]
+
+  if (Objects.isNotEmpty(cycle)) {
+    parts.push(`(cycle-${RecordCycle.getLabel(cycle)})`)
+  }
+  if (Objects.isNotEmpty(itemName)) {
+    parts.push(encodeURIComponent(itemName))
+  }
+  parts.push(fileType)
+
+  if (includeTimestamp) {
+    parts.push(DateUtils.nowFormatDefault())
+  }
+  return `${parts.join('_')}.${extension}`
 }
 
 export const ExportFileNameGenerator = {
diff --git a/test/e2e/tests/_nodeDefDetails/editExpression.js b/test/e2e/tests/_nodeDefDetails/editExpression.js
index 487294f268..12815b696d 100644
--- a/test/e2e/tests/_nodeDefDetails/editExpression.js
+++ b/test/e2e/tests/_nodeDefDetails/editExpression.js
@@ -3,14 +3,18 @@ import { TestId, getSelector } from '../../../../webapp/utils/testId'
 import { FormUtils } from '../utils/formUtils'
 import { persistNodeDefChanges } from './editDetails'
 
+const advancedTextEditorSelector = '.cm-content'
+
 const editAdvanced = async (expressionStr) => {
   await page.click(getSelector(TestId.expressionEditor.toggleModeBtn, 'button'))
   // wait for codemirror to initialize
   await page.waitForTimeout(500)
 
-  const codeMirror = await page.waitForSelector('.CodeMirror')
+  await page.waitForSelector(advancedTextEditorSelector)
+  const textEditorLocator = page.locator(advancedTextEditorSelector)
+  await textEditorLocator.click()
   await each(expressionStr, async (char) => {
-    await codeMirror.press(char)
+    await textEditorLocator.press(char)
   })
 }
 
diff --git a/webapp/components/Map/Map.js b/webapp/components/Map/Map.js
index d7a720e0b7..0dfbab0323 100644
--- a/webapp/components/Map/Map.js
+++ b/webapp/components/Map/Map.js
@@ -1,7 +1,7 @@
 import './Map.scss'
 
 import React from 'react'
-import { MapContainer, ScaleControl } from 'react-leaflet'
+import { GeoJSON, MapContainer, ScaleControl } from 'react-leaflet'
 import PropTypes from 'prop-types'
 
 import { ButtonSave } from '@webapp/components'
@@ -32,7 +32,7 @@ L.Marker.prototype.options.icon = L.icon({
 const INITIAL_ZOOM_LEVEL = 3
 
 export const Map = (props) => {
-  const { editable = false, layers = [], markerPoint, markerTitle, showOptions = true } = props
+  const { editable = false, geoJson = null, layers = [], markerPoint, markerTitle, showOptions = true } = props
   const { centerPositionLatLon, markerPointUpdated, markerPointUpdatedToString, onMarkerPointUpdated, onSaveClick } =
     useMap(props)
 
@@ -54,6 +54,7 @@ export const Map = (props) => {
             onPointUpdated={onMarkerPointUpdated}
             title={markerTitle}
           />
+          {geoJson && <GeoJSON data={geoJson} />}
           {showOptions && (
             <>
               <MapOptionsEditor />
@@ -85,6 +86,7 @@ export const Map = (props) => {
 Map.propTypes = {
   centerPoint: PropTypes.object,
   editable: PropTypes.bool,
+  geoJson: PropTypes.object,
   layers: PropTypes.array,
   markerPoint: PropTypes.object,
   markerTitle: PropTypes.string,
diff --git a/webapp/components/ResizableModal/ResizableModal.js b/webapp/components/ResizableModal/ResizableModal.js
index 4c37320365..af8a0ae10d 100644
--- a/webapp/components/ResizableModal/ResizableModal.js
+++ b/webapp/components/ResizableModal/ResizableModal.js
@@ -39,7 +39,15 @@ export const ResizableModal = (props) => {
 
   return (
     <div className={classNames('resizable-modal', className)}>
-      <ReactModal initHeight={initHeight} initWidth={initWidth} isOpen={isOpen} left={left} ref={modalRef} top={top}>
+      <ReactModal
+        initHeight={initHeight}
+        initWidth={initWidth}
+        isOpen={isOpen}
+        left={left}
+        onRequestClose={onRequestClose}
+        ref={modalRef}
+        top={top}
+      >
         <div className="resizable-modal__header">
           <h3>{header}</h3>
           {onDetach && (
@@ -68,6 +76,6 @@ ResizableModal.propTypes = {
   left: PropTypes.number,
   onClose: PropTypes.func,
   onDetach: PropTypes.func,
-  onRequestClose: PropTypes.func,
+  onRequestClose: PropTypes.func.isRequired,
   top: PropTypes.number,
 }
diff --git a/webapp/components/TreeView/TreeView.js b/webapp/components/TreeView/TreeView.js
index c48ef129b4..1b3a447cd2 100644
--- a/webapp/components/TreeView/TreeView.js
+++ b/webapp/components/TreeView/TreeView.js
@@ -5,9 +5,15 @@ import PropTypes from 'prop-types'
 
 import { SimpleTreeView } from '@mui/x-tree-view/SimpleTreeView'
 import { TreeItem as MuiTreeItem } from '@mui/x-tree-view/TreeItem'
+import { Objects } from '@openforis/arena-core'
+
+import { ArrayUtils } from '@core/arrayUtils'
+
+import { LabelWithTooltip } from '../form/LabelWithTooltip'
 
 const TreeItemPropTypes = PropTypes.shape({
   key: PropTypes.string.isRequired,
+  icon: PropTypes.any,
   items: PropTypes.array,
   label: PropTypes.string.isRequired,
   testId: PropTypes.string,
@@ -15,9 +21,19 @@ const TreeItemPropTypes = PropTypes.shape({
 
 const TreeItemView = (props) => {
   const { item } = props
-  const { key, label, items, testId } = item
+  const { key, icon, label, items, testId } = item
   return (
-    <MuiTreeItem key={key} itemId={key} label={label} data-testid={testId}>
+    <MuiTreeItem
+      key={key}
+      itemId={key}
+      label={
+        <div className="tree-item-label display-flex">
+          {icon}
+          <LabelWithTooltip label={label} />
+        </div>
+      }
+      data-testid={testId}
+    >
       {items?.map((childItem) => (
         <TreeItemView key={childItem.key} item={childItem} />
       ))}
@@ -43,7 +59,8 @@ export const TreeView = (props) => {
       const treeItemKeysBeingCollapsed = expadedItemKeys.filter(
         (oldExpandedItemId) => !itemIds.includes(oldExpandedItemId)
       )
-      if (treeItemKeysBeingCollapsed.length > 0 && event?.target?.className === 'MuiTreeItem-label') {
+      const targetClass = String(event?.target?.className)
+      if (treeItemKeysBeingCollapsed.length > 0 && targetClass.includes('label')) {
         // do not collapse item if it is expanded and label is clicked; handle only selection;
         return false
       }
@@ -54,9 +71,11 @@ export const TreeView = (props) => {
 
   const onSelectedItemsChange = useCallback(
     (_event, itemIds) => {
-      onSelectedItemKeysChange(itemIds)
+      if (!Objects.isEqual(selectedItemKeys, ArrayUtils.toArray(itemIds))) {
+        onSelectedItemKeysChange(itemIds)
+      }
     },
-    [onSelectedItemKeysChange]
+    [onSelectedItemKeysChange, selectedItemKeys]
   )
 
   return (
diff --git a/webapp/components/buttons/ButtonNext.js b/webapp/components/buttons/ButtonNext.js
index 2b4627cebd..9ca7a0972e 100644
--- a/webapp/components/buttons/ButtonNext.js
+++ b/webapp/components/buttons/ButtonNext.js
@@ -4,7 +4,7 @@ import { Button } from './Button'
 
 export const ButtonNext = (props) => {
   const { label = 'common.next' } = props
-  return <Button {...props} iconClassName="icon-arrow-right icon-12px icon-left" label={label} />
+  return <Button {...props} iconClassName="icon-arrow-right icon-12px" label={label} />
 }
 
 ButtonNext.propTypes = {
diff --git a/webapp/components/buttons/ButtonPrevious.js b/webapp/components/buttons/ButtonPrevious.js
index 9d69c52aa6..d6dfbc4990 100644
--- a/webapp/components/buttons/ButtonPrevious.js
+++ b/webapp/components/buttons/ButtonPrevious.js
@@ -4,7 +4,7 @@ import { Button } from './Button'
 
 export const ButtonPrevious = (props) => {
   const { label = 'common.previous' } = props
-  return <Button {...props} iconClassName="icon-arrow-left icon-12px icon-left" label={label} />
+  return <Button {...props} iconClassName="icon-arrow-left icon-12px" label={label} />
 }
 
 ButtonPrevious.propTypes = {
diff --git a/webapp/components/expression/advancedExpressionEditorPopup.js b/webapp/components/expression/advancedExpressionEditorPopup.js
index b742d9924a..812ca719aa 100644
--- a/webapp/components/expression/advancedExpressionEditorPopup.js
+++ b/webapp/components/expression/advancedExpressionEditorPopup.js
@@ -1,18 +1,36 @@
 import './expressionEditorPopup.scss'
 
-import React, { useState, useRef, useEffect, useCallback } from 'react'
+import React, { useState, useCallback, useMemo } from 'react'
+import ReactCodeMirror from '@uiw/react-codemirror'
+import { javascript } from '@codemirror/lang-javascript'
+import { autocompletion } from '@codemirror/autocomplete'
 import PropTypes from 'prop-types'
-import CodeMirror from 'codemirror/lib/codemirror'
-import 'codemirror/addon/hint/show-hint'
 
+import * as NodeDef from '@core/survey/nodeDef'
 import * as NodeDefExpressionValidator from '@core/survey/nodeDefExpressionValidator'
 import * as Expression from '@core/expressionParser/expression'
 
 import { useI18n } from '@webapp/store/system'
-import { useSurvey, useSurveyCycleKey } from '@webapp/store/survey'
-import { TestId } from '@webapp/utils/testId'
-
-import { arenaExpressionHint } from './codemirrorArenaExpressionHint'
+import { useSurvey } from '@webapp/store/survey'
+
+import { useAutocompletionSource } from './useAutocompletionSource'
+
+const codeMirrorBasicSetup = { foldGutter: false, lineNumbers: false }
+
+const completionsCompareFn = (contextUuid) => (completionA, completionB) => {
+  const { apply: applyA, label: labelA, parentUuid: parentUuidA, type: typeA } = completionA
+  const { apply: applyB, label: labelB, parentUuid: parentUuidB, type: typeB } = completionB
+  const typeComparison = typeB.localeCompare(typeA)
+  if (typeComparison === 0 && typeA === 'variable') {
+    if (applyA === Expression.thisVariable) return -1
+    if (applyB === Expression.thisVariable) return 1
+    if (parentUuidA !== parentUuidB) {
+      if (parentUuidA === contextUuid) return -1
+      if (parentUuidB === contextUuid) return 1
+    }
+  }
+  return typeComparison || labelA.localeCompare(labelB)
+}
 
 const AdvancedExpressionEditorPopup = (props) => {
   const {
@@ -25,13 +43,38 @@ const AdvancedExpressionEditorPopup = (props) => {
     updateDraftQuery,
   } = props
 
-  const inputRef = useRef()
   const i18n = useI18n()
   const survey = useSurvey()
-  const cycle = useSurveyCycleKey()
+  const nodeDefCurrentParentUuid = NodeDef.getParentUuid(nodeDefCurrent)
 
   const [errorMessage, setErrorMessage] = useState(null)
-  const editorRef = useRef(null)
+
+  const autocompletionSource = useAutocompletionSource({
+    mode,
+    nodeDefCurrent,
+    isContextParent,
+    includeAnalysis,
+  })
+
+  const codeMirrorExtensions = useMemo(
+    () => [
+      javascript(),
+      autocompletion({
+        closeOnBlur: true,
+        // add a carriage return after the label in the rendered item option
+        addToOptions: [
+          {
+            render: () => document.createElement('br'),
+            position: 60,
+          },
+        ],
+        compareCompletions: completionsCompareFn(nodeDefCurrentParentUuid),
+        override: [autocompletionSource],
+        optionClass: (completion) => `cm-completion-option ${completion.type}`,
+      }),
+    ],
+    [autocompletionSource, nodeDefCurrentParentUuid]
+  )
 
   const validateEditorValue = useCallback(
     (value) => {
@@ -54,12 +97,9 @@ const AdvancedExpressionEditorPopup = (props) => {
   )
 
   const onEditorChange = useCallback(
-    (cm) => {
-      const value = cm.getValue()
+    (value) => {
       const valueTrimmed = value.trim()
-
       const valid = validateEditorValue(valueTrimmed)
-
       if (valid && valueTrimmed !== query) {
         updateDraftQuery(valueTrimmed)
       }
@@ -67,45 +107,19 @@ const AdvancedExpressionEditorPopup = (props) => {
     [query, updateDraftQuery, validateEditorValue]
   )
 
-  // initialize CodeMirror text area
-  useEffect(() => {
-    const editor = CodeMirror.fromTextArea(inputRef.current, {
-      lineNumbers: false,
-      autofocus: true,
-      extraKeys: { 'Ctrl-Space': 'autocomplete' },
-      mode: { name: 'arena-expression' },
-      hintOptions: {
-        hint: arenaExpressionHint({ mode, i18n, survey, cycle, nodeDefCurrent, isContextParent, includeAnalysis }),
-      },
-    })
-    editor.setSize('100%', 'auto')
-
-    editor.on('change', onEditorChange)
-
-    editorRef.current = editor
-
-    return () => editor.toTextArea()
-  }, [])
-
-  // handle query prop change
-  useEffect(() => {
-    const editor = editorRef.current
-    if (editor.getValue() !== query) {
-      editor.setValue(query)
-    }
-  }, [query])
-
   return (
     <>
-      {errorMessage ? (
-        <div className="expression-editor__query-container">
-          <div className="query invalid">{i18n.t(errorMessage.key, errorMessage.params)}</div>
-        </div>
-      ) : (
-        <div style={{ height: '34px' }} />
-      )}
+      <div className="expression-editor__query-container">
+        {errorMessage && <div className="query invalid">{i18n.t(errorMessage.key, errorMessage.params)}</div>}
+      </div>
       <div className="expression-editor-popup__expr-container">
-        <textarea data-testid={TestId.expressionEditor.advancedQuery} ref={inputRef} />
+        <ReactCodeMirror
+          autoFocus
+          basicSetup={codeMirrorBasicSetup}
+          extensions={codeMirrorExtensions}
+          onChange={onEditorChange}
+          value={query}
+        />
       </div>
       <div className="expression-editor-popup__editor-help">
         <p>{i18n.t(`nodeDefEdit.editorHelp.${mode}`)}</p>
diff --git a/webapp/components/expression/codemirrorArenaExpressionHint.js b/webapp/components/expression/codemirrorArenaExpressionHint.js
deleted file mode 100644
index 1509d8f51e..0000000000
--- a/webapp/components/expression/codemirrorArenaExpressionHint.js
+++ /dev/null
@@ -1,229 +0,0 @@
-import CodeMirror from 'codemirror/lib/codemirror'
-
-import * as Survey from '@core/survey/survey'
-import * as Expression from '@core/expressionParser/expression'
-import * as NodeDefExpressionValidator from '@core/survey/nodeDefExpressionValidator'
-
-import * as ExpressionVariables from './expressionVariables'
-
-const functionExamples = {
-  [Expression.modes.json]: {
-    [Expression.functionNames.categoryItemProp]:
-      `cateoryItemProp('category_name', 'prop_name', 'codeLevel1', 'codeLevel2', ...)`,
-    [Expression.functionNames.distance]: 'distance(coordinate_attribute_1, coordinate_attribute_2)',
-    [Expression.functionNames.first]:
-      'first(multiple_attribute_name), first(multiple_entity_name).entity_attribute_name, ...',
-    [Expression.functionNames.includes]: `includes(multiple_attribute_name, 'value') = true/false`,
-    [Expression.functionNames.index]: `index(node_name), index(this), index($context), index(parent(this))`,
-    [Expression.functionNames.isEmpty]: `isEmpty(attribute_name) = true/false`,
-    [Expression.functionNames.isNotEmpty]: `isNotEmpty(attribute_name) = true/false`,
-    [Expression.functionNames.last]:
-      'last(multiple_entity_name).entity_attribute_name, last(multiple_attribute_name), ...',
-    [Expression.functionNames.ln]: 'ln(10) = 2.302…',
-    [Expression.functionNames.log10]: 'log10(100) = 2',
-    [Expression.functionNames.max]: 'max(3,1,2) = 3',
-    [Expression.functionNames.min]: 'min(3,1) = 1',
-    [Expression.functionNames.now]: 'now()',
-    [Expression.functionNames.parent]: `parent(this), parent($context), parent(node_name)`,
-    [Expression.functionNames.pow]: 'pow(2,3) = 2³ = 8',
-    [Expression.functionNames.taxonProp]: `taxonProp('taxonomy_name', 'extra_prop', 'taxon_code')`,
-    [Expression.functionNames.uuid]: 'uuid()',
-  },
-  [Expression.modes.sql]: {
-    [Expression.functionNames.avg]: 'avg(variable_name)',
-    [Expression.functionNames.count]: 'count(variable_name)',
-    [Expression.functionNames.sum]: 'sum(variable_name)',
-  },
-}
-
-const _findCharIndex = ({ value, end, matchingRegEx }) => {
-  for (let i = end; i >= 0; i -= 1) {
-    if (matchingRegEx.test(value[i])) return i + 1
-  }
-  return 0
-}
-
-const nonIdRegex = /[^\w_]/
-const getVariableNameStart = ({ value, end }) => _findCharIndex({ value, end, matchingRegEx: nonIdRegex })
-
-const variablesSeparatorRegex = /[\s\-+*/&|]/
-const getVariablePathStart = ({ value, end }) => _findCharIndex({ value, end, matchingRegEx: variablesSeparatorRegex })
-
-const getVariableCompletion = ({ group = null, variable, token }) => {
-  const { label, value } = variable
-
-  const textParts = []
-  if (group) {
-    textParts.push(group.label)
-  }
-  if (label && label !== value) {
-    textParts.push(`${label} (${value})`)
-  } else {
-    textParts.push(value)
-  }
-  const text = textParts.join('.')
-  const data = { text, value }
-
-  return {
-    text,
-    value,
-    data,
-    hint: (cm, _data, completionHint) => {
-      const doc = cm.getDoc()
-      const from = { line: token.line, ch: token.start }
-      const to = { line: token.line, ch: token.end }
-      doc.replaceRange(completionHint.value, from, to)
-    },
-  }
-}
-
-const getFunctionCompletion = ({ mode, i18n, fnName, token }) => {
-  const description = i18n.t(`nodeDefEdit.functionDescriptions.${fnName}`)
-  const exampleUsage = functionExamples[mode][fnName]
-  const label = `${i18n.t('nodeDefEdit.function')}: ${fnName}: ${exampleUsage}\n  ${description}`
-  const completion = {
-    text: label,
-    value: fnName,
-  }
-  completion.data = completion
-  completion.hint = (cm, _data, completionHint) => {
-    const doc = cm.getDoc()
-    const from = { line: token.line, ch: token.start }
-    const to = { line: token.line, ch: token.end }
-    doc.replaceRange(completionHint.value, from, to)
-  }
-
-  return completion
-}
-
-const getCompletions = ({ mode, i18n, token, variablesGroupedByParentEntity }) => {
-  const completions = []
-  const start = token.string.toLowerCase().slice(token.start, token.end)
-
-  const includeVariableIfStartsWith = ({ group = null, variable }) => {
-    ;[variable.value, variable.label].some((varName) => {
-      if (varName && varName.toLowerCase().startsWith(start)) {
-        completions.push(getVariableCompletion({ group, variable, token }))
-        // Either node.value or node.label matches - no need for both
-        return true
-      }
-      return false
-    })
-  }
-
-  variablesGroupedByParentEntity.forEach((group) => {
-    // group can be a variable (current node def variable)
-    if (group.value) {
-      includeVariableIfStartsWith({ variable: group })
-    }
-
-    group.options?.forEach((variable) => {
-      includeVariableIfStartsWith({ group, variable })
-    })
-  })
-
-  Object.keys(functionExamples[mode]).forEach((fnName) => {
-    if (fnName && fnName.toLowerCase().startsWith(start)) {
-      completions.push(getFunctionCompletion({ mode, i18n, fnName, token }))
-    }
-  })
-
-  return completions
-}
-
-/* eslint-disable no-param-reassign */
-const _prepareTokenForCompletion = ({ token, cursorPosition, cursorLine }) => {
-  token.start = getVariableNameStart({ value: token.string, end: cursorPosition })
-  token.line = cursorLine
-
-  if (token.end > cursorPosition) {
-    token.end = cursorPosition
-    token.string = token.string.slice(0, cursorPosition - token.start)
-  }
-}
-
-const _extractVariables = ({
-  mode,
-  i18n,
-  survey,
-  cycle,
-  nodeDefCurrent,
-  nodeDefContextPath,
-  isContextParent,
-  includeAnalysis = false,
-}) => {
-  const nodeDefContextParent = isContextParent ? Survey.getNodeDefParent(nodeDefCurrent)(survey) : nodeDefCurrent
-  let nodeDefContext = nodeDefContextParent
-
-  const { lang } = i18n
-  const groupByParent = true
-
-  if (nodeDefContextPath) {
-    try {
-      nodeDefContext = NodeDefExpressionValidator.findReferencedNodeDefLast({
-        survey,
-        nodeDef: nodeDefCurrent,
-        exprString: nodeDefContextPath,
-      })
-    } catch (e) {
-      // ignore it
-    }
-    return nodeDefContext
-      ? ExpressionVariables.getVariablesChildren({
-          survey,
-          cycle,
-          nodeDefContext,
-          nodeDefCurrent,
-          mode,
-          lang,
-          groupByParent,
-          includeAnalysis,
-        })
-      : []
-  }
-  // get variables from context node and its ancestors
-  return ExpressionVariables.getVariables({
-    survey,
-    cycle,
-    nodeDefContext,
-    nodeDefCurrent,
-    mode,
-    lang,
-    groupByParent,
-    includeAnalysis,
-  })
-}
-
-export const arenaExpressionHint =
-  ({ mode, i18n, survey, cycle, nodeDefCurrent, isContextParent = true, includeAnalysis = false }) =>
-  (editor) => {
-    const cur = editor.getCursor()
-    const token = editor.getTokenAt(cur)
-
-    const { ch: cursorPosition, line: cursorLine } = cur
-
-    const variablePath = token.string.slice(
-      getVariablePathStart({ value: token.string, end: cursorPosition }),
-      cursorPosition
-    )
-    _prepareTokenForCompletion({ token, cursorPosition, cursorLine })
-
-    const nodeDefContextPath = variablePath.substring(0, variablePath.lastIndexOf('.'))
-
-    const variablesGroupedByParentEntity = _extractVariables({
-      mode,
-      i18n,
-      survey,
-      cycle,
-      nodeDefCurrent,
-      nodeDefContextPath,
-      isContextParent,
-      includeAnalysis,
-    })
-
-    return {
-      list: getCompletions({ mode, i18n, token, variablesGroupedByParentEntity }),
-      from: CodeMirror.Pos(token.line, token.start),
-      to: CodeMirror.Pos(token.line, token.end),
-    }
-  }
diff --git a/webapp/components/expression/expressionEditor.js b/webapp/components/expression/expressionEditor.js
index 00227ab2d1..a1fa42fa67 100644
--- a/webapp/components/expression/expressionEditor.js
+++ b/webapp/components/expression/expressionEditor.js
@@ -29,6 +29,7 @@ const ExpressionEditor = (props) => {
     placeholder = false,
     qualifier,
     query = '',
+    readOnly = false,
     types = [ExpressionEditorType.basic, ExpressionEditorType.advanced],
   } = props
 
@@ -86,13 +87,15 @@ const ExpressionEditor = (props) => {
               {query}
             </div>
           )}
-          <Button
-            className="btn-s btn-edit"
-            iconClassName="icon-pencil2 icon-14px"
-            id={`${idPrefix}-edit-btn`}
-            onClick={() => setEdit(true)}
-            testId={TestId.expressionEditor.editBtn(qualifier)}
-          />
+          {!readOnly && (
+            <Button
+              className="btn-s btn-edit"
+              iconClassName="icon-pencil2 icon-14px"
+              id={`${idPrefix}-edit-btn`}
+              onClick={() => setEdit(true)}
+              testId={TestId.expressionEditor.editBtn(qualifier)}
+            />
+          )}
         </div>
       )}
     </div>
@@ -114,6 +117,7 @@ ExpressionEditor.propTypes = {
   canBeConstant: PropTypes.bool,
   isBoolean: PropTypes.bool,
   onChange: PropTypes.func,
+  readOnly: PropTypes.bool,
 }
 
 export default ExpressionEditor
diff --git a/webapp/components/expression/expressionEditor.scss b/webapp/components/expression/expressionEditor.scss
index 542d17a623..2f2d12afae 100644
--- a/webapp/components/expression/expressionEditor.scss
+++ b/webapp/components/expression/expressionEditor.scss
@@ -8,6 +8,7 @@
 .expression-editor__query-container {
   display: flex;
   align-items: center;
+  min-height: 3rem;
 
   .query {
     padding: 0.5rem 1rem;
diff --git a/webapp/components/expression/expressionEditorPopup.scss b/webapp/components/expression/expressionEditorPopup.scss
index fecd75276a..c1da8d50ef 100644
--- a/webapp/components/expression/expressionEditorPopup.scss
+++ b/webapp/components/expression/expressionEditorPopup.scss
@@ -1,11 +1,5 @@
-@import '~codemirror/lib/codemirror.css';
-@import '~codemirror/addon/hint/show-hint';
 @import 'webapp/style/vars';
 
-.CodeMirror-hints {
-  z-index: $zIndex20Dropdown;
-}
-
 .expression-editor-popup {
   display: flex;
   flex-direction: column;
@@ -180,3 +174,18 @@
     font-weight: 600;
   }
 }
+
+.cm-tooltip-autocomplete {
+  .cm-completionDetail {
+    margin-left: 2rem;
+    text-wrap: wrap;
+    white-space: pre-wrap;
+    -webkit-box-decoration-break: clone;
+    box-decoration-break: clone;
+  }
+  .cm-completion-option.function {
+    .cm-completionLabel {
+      font-weight: bold;
+    }
+  }
+}
diff --git a/webapp/components/expression/expressionVariables.js b/webapp/components/expression/expressionVariables.js
index 14127045f7..0da6832f58 100644
--- a/webapp/components/expression/expressionVariables.js
+++ b/webapp/components/expression/expressionVariables.js
@@ -143,6 +143,7 @@ const getVariablesGroupedByParentUuid = ({
   mode,
   nodeDefCurrent = null,
   excludeCurrentNodeDef = false,
+  includeThis = true,
 }) => {
   const variablesGroupedByParentUuid = variables.reduce(
     (byParentUuid, variable) => ({
@@ -165,7 +166,7 @@ const getVariablesGroupedByParentUuid = ({
     // sort groups by hierarchy level, in descending order
     .sort((groupA, groupB) => groupB.hierarchyLevel - groupA.hierarchyLevel)
 
-  if (!nodeDefCurrent || excludeCurrentNodeDef) {
+  if (!nodeDefCurrent || excludeCurrentNodeDef || !includeThis) {
     return groups
   }
   // always show current variable at the beginning
@@ -245,5 +246,7 @@ export const getVariablesChildren = ({
 
   _sortVariables({ nodeDefCurrent, variables })
 
-  return groupByParent ? getVariablesGroupedByParentUuid({ variables, survey, nodeDefCurrent }) : variables
+  return groupByParent
+    ? getVariablesGroupedByParentUuid({ variables, survey, nodeDefCurrent, includeThis: false })
+    : variables
 }
diff --git a/webapp/components/expression/functionExamples.js b/webapp/components/expression/functionExamples.js
new file mode 100644
index 0000000000..2824f332e0
--- /dev/null
+++ b/webapp/components/expression/functionExamples.js
@@ -0,0 +1,57 @@
+import * as ProcessUtils from '@core/processUtils'
+import * as Expression from '@core/expressionParser/expression'
+
+const functionExamples = {
+  [Expression.modes.json]: {
+    [Expression.functionNames.categoryItemProp]:
+      `cateoryItemProp('category_name', 'prop_name', 'codeLevel1', 'codeLevel2', ...)`,
+    [Expression.functionNames.distance]: 'distance(coordinate_attribute_1, coordinate_attribute_2)',
+    [Expression.functionNames.first]:
+      'first(multiple_attribute_name), first(multiple_entity_name).entity_attribute_name, ...',
+    [Expression.functionNames.geoPolygon]:
+      'geoPolygon(coordinate_attribute_1, coordinate_attribute_2, ...), geoPolygon(multiple_entity_name.coordinate_attribute), ...',
+    [Expression.functionNames.includes]: `includes(multiple_attribute_name, 'value') = true/false`,
+    [Expression.functionNames.index]: `index(node_name), index(this), index($context), index(parent(this))`,
+    [Expression.functionNames.isEmpty]: `isEmpty(attribute_name) = true/false`,
+    [Expression.functionNames.isNotEmpty]: `isNotEmpty(attribute_name) = true/false`,
+    [Expression.functionNames.last]:
+      'last(multiple_entity_name).entity_attribute_name, last(multiple_attribute_name), ...',
+    [Expression.functionNames.ln]: 'ln(10) = 2.302…',
+    [Expression.functionNames.log10]: 'log10(100) = 2',
+    [Expression.functionNames.max]: 'max(3,1,2) = 3',
+    [Expression.functionNames.min]: 'min(3,1) = 1',
+    [Expression.functionNames.now]: 'now()',
+    [Expression.functionNames.parent]: `parent(this), parent($context), parent(node_name)`,
+    [Expression.functionNames.pow]: 'pow(2,3) = 2³ = 8',
+    [Expression.functionNames.taxonProp]: `taxonProp('taxonomy_name', 'extra_prop', 'taxon_code')`,
+    [Expression.functionNames.uuid]: 'uuid()',
+  },
+  [Expression.modes.sql]: {
+    [Expression.functionNames.avg]: 'avg(variable_name)',
+    [Expression.functionNames.count]: 'count(variable_name)',
+    [Expression.functionNames.sum]: 'sum(variable_name)',
+  },
+}
+
+const experimentalFunctions = [Expression.functionNames.geoPolygon]
+const isFunctionAvailable = (functionName) =>
+  ProcessUtils.ENV.experimentalFeatures || !experimentalFunctions.includes(functionName)
+
+const availableFunctionExamples = Object.entries(functionExamples).reduce(
+  (accFunctionsByMode, [mode, functionsInMode]) => {
+    const availableFunctionInMode = Object.entries(functionsInMode).reduce(
+      (accFunctionsByName, [functionName, value]) => {
+        if (isFunctionAvailable(functionName)) {
+          accFunctionsByName[functionName] = value
+        }
+        return accFunctionsByName
+      },
+      {}
+    )
+    accFunctionsByMode[mode] = availableFunctionInMode
+    return accFunctionsByMode
+  },
+  {}
+)
+
+export default availableFunctionExamples
diff --git a/webapp/components/expression/useAutocompletionSource.js b/webapp/components/expression/useAutocompletionSource.js
new file mode 100644
index 0000000000..63f2a4fcd5
--- /dev/null
+++ b/webapp/components/expression/useAutocompletionSource.js
@@ -0,0 +1,191 @@
+import { useCallback } from 'react'
+
+import * as Survey from '@core/survey/survey'
+import * as NodeDefExpressionValidator from '@core/survey/nodeDefExpressionValidator'
+
+import { useI18n } from '@webapp/store/system'
+import { useSurvey, useSurveyCycleKey } from '@webapp/store/survey'
+
+import * as ExpressionVariables from './expressionVariables'
+import functionExamples from './functionExamples'
+
+const _findCharIndex = ({ value, end, matchingRegEx }) => {
+  for (let i = end; i >= 0; i -= 1) {
+    if (matchingRegEx.test(value[i])) return i + 1
+  }
+  return 0
+}
+
+const variablesSeparatorRegex = /[\s\-+*/&|]/
+const getVariablePathStart = ({ value, end }) => _findCharIndex({ value, end, matchingRegEx: variablesSeparatorRegex })
+
+const getVariableCompletion = ({ group = null, variable }) => {
+  const { label, value } = variable
+
+  const textParts = []
+  if (group) {
+    textParts.push(group.label)
+  }
+  if (label && label !== value) {
+    textParts.push(`${label} (${value})`)
+  } else {
+    textParts.push(value)
+  }
+  const text = textParts.join('.')
+
+  return {
+    label: text,
+    apply: value,
+    type: 'variable',
+    parentUuid: variable.parentUuid ?? variable[0]?.parentUuid,
+  }
+}
+
+const getFunctionCompletion = ({ mode, i18n, fnName }) => {
+  const description = i18n.t(`nodeDefEdit.functionDescriptions.${fnName}`)
+  const exampleUsage = functionExamples[mode][fnName]
+  // const label = `${i18n.t('nodeDefEdit.function')}: ${fnName}: ${exampleUsage}`
+  const completion = {
+    label: fnName,
+    detail: `e.g. ${exampleUsage}\n${description}`,
+    apply: `${fnName}()`,
+    type: 'function',
+  }
+  return completion
+}
+
+const getCompletions = ({ mode, i18n, token, variablesGroupedByParentEntity, includeCustomFunctions = true }) => {
+  const completions = []
+  const tokenText = token.text.toLowerCase()
+
+  const includeVariableIfStartsWith = ({ group = null, variable }) => {
+    ;[variable.value, variable.label].some((varName) => {
+      if (varName?.toLowerCase().startsWith(tokenText)) {
+        completions.push(getVariableCompletion({ group, variable }))
+        // Either node.value or node.label matches - no need for both
+        return true
+      }
+      return false
+    })
+  }
+
+  variablesGroupedByParentEntity.forEach((group) => {
+    // group can be a variable (current node def variable)
+    if (group.value) {
+      includeVariableIfStartsWith({ variable: group })
+    }
+    group.options?.forEach((variable) => {
+      includeVariableIfStartsWith({ group, variable })
+    })
+  })
+
+  if (includeCustomFunctions) {
+    Object.keys(functionExamples[mode]).forEach((fnName) => {
+      if (fnName?.toLowerCase().startsWith(tokenText)) {
+        completions.push(getFunctionCompletion({ mode, i18n, fnName }))
+      }
+    })
+  }
+  return completions
+}
+
+const findNodeDefContext = ({ survey, nodeDefCurrent, nodeDefContextPath }) => {
+  let nodeDefContext = null
+  try {
+    nodeDefContext = NodeDefExpressionValidator.findReferencedNodeDefLast({
+      survey,
+      nodeDef: nodeDefCurrent,
+      exprString: nodeDefContextPath,
+    })
+  } catch (e) {
+    // ignore it
+  }
+  return nodeDefContext
+}
+
+const extractVariables = ({
+  mode,
+  i18n,
+  survey,
+  cycle,
+  nodeDefCurrent,
+  nodeDefContextPath,
+  isContextParent,
+  includeAnalysis = false,
+}) => {
+  const nodeDefContextParent = isContextParent ? Survey.getNodeDefParent(nodeDefCurrent)(survey) : nodeDefCurrent
+
+  const { lang } = i18n
+  const groupByParent = true
+
+  if (!nodeDefContextPath) {
+    // get variables from context node and its ancestors
+    return ExpressionVariables.getVariables({
+      survey,
+      cycle,
+      nodeDefContext: nodeDefContextParent,
+      nodeDefCurrent,
+      mode,
+      lang,
+      groupByParent,
+      includeAnalysis,
+    })
+  }
+  const nodeDefContext = findNodeDefContext({ survey, nodeDefCurrent, nodeDefContextPath })
+  if (!nodeDefContext) {
+    return []
+  }
+  return ExpressionVariables.getVariablesChildren({
+    survey,
+    cycle,
+    nodeDefContext,
+    nodeDefCurrent,
+    mode,
+    lang,
+    groupByParent,
+    includeAnalysis,
+  })
+}
+
+export const useAutocompletionSource = ({ mode, nodeDefCurrent, isContextParent = true, includeAnalysis = false }) => {
+  const i18n = useI18n()
+  const survey = useSurvey()
+  const cycle = useSurveyCycleKey()
+
+  return useCallback(
+    (context) => {
+      const matchingTokenBefore = context.matchBefore(/\w*/)
+
+      if (matchingTokenBefore.from == matchingTokenBefore.to && !context.explicit) return null
+
+      const value = context.state?.doc?.text?.[0] ?? ''
+      const token = { ...matchingTokenBefore, value }
+      const cursorPosition = context.pos
+
+      const variablePath = value.slice(getVariablePathStart({ value, end: cursorPosition }), cursorPosition)
+
+      const nodeDefContextPath = variablePath.substring(0, variablePath.lastIndexOf('.'))
+
+      const variablesGroupedByParentEntity = extractVariables({
+        mode,
+        i18n,
+        survey,
+        cycle,
+        nodeDefCurrent,
+        nodeDefContextPath,
+        isContextParent,
+        includeAnalysis,
+      })
+      const options = getCompletions({
+        mode,
+        i18n,
+        token,
+        variablesGroupedByParentEntity,
+        includeCustomFunctions: !nodeDefContextPath,
+      })
+
+      return { from: token.from, options }
+    },
+    [cycle, i18n, includeAnalysis, isContextParent, mode, nodeDefCurrent, survey]
+  )
+}
diff --git a/webapp/components/form/Input/Input.js b/webapp/components/form/Input/Input.js
index a75d3b35ab..c389170eea 100644
--- a/webapp/components/form/Input/Input.js
+++ b/webapp/components/form/Input/Input.js
@@ -6,7 +6,7 @@ import classNames from 'classnames'
 import { TextField } from '@mui/material'
 import PropTypes from 'prop-types'
 
-import { Strings } from '@openforis/arena-core'
+import { Objects } from '@openforis/arena-core'
 
 import { useOnUpdate } from '../../hooks'
 import ValidationTooltip from '../../validationTooltip'
@@ -41,11 +41,13 @@ export const Input = React.forwardRef((props, ref) => {
   const selectionAllowed = type === 'text'
   const selectionInitial = selectionAllowed ? [value.length, value.length] : null
   const selectionRef = useRef(selectionInitial)
-  const valueText = Strings.defaultIfEmpty('')(value)
+  const valueText = Objects.isEmpty(value) ? '' : String(value)
   const title = titleProp ?? valueText
 
   const handleValueChange = useCallback(
     (newValue) => {
+      if (disabled) return
+
       const input = inputRef.current
       if (selectionAllowed) {
         selectionRef.current = [input.selectionStart, input.selectionEnd]
@@ -54,7 +56,7 @@ export const Input = React.forwardRef((props, ref) => {
         onChange(textTransformFunction(newValue))
       }
     },
-    [inputRef, onChange, selectionAllowed, textTransformFunction]
+    [disabled, inputRef, onChange, selectionAllowed, textTransformFunction]
   )
 
   const onFormattedValueChange = useCallback(
@@ -126,15 +128,6 @@ Input.propTypes = {
   inputType: PropTypes.oneOf(['input', 'textarea']),
   maxLength: PropTypes.number,
   name: PropTypes.string,
-  onChange: PropTypes.func,
-  onFocus: PropTypes.func,
-  onBlur: PropTypes.func,
-  placeholder: PropTypes.string,
-  readOnly: PropTypes.bool,
-  title: PropTypes.string,
-  type: PropTypes.oneOf(['text', 'number', 'password']),
-  validation: PropTypes.object,
-  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   numberFormat: PropTypes.shape({
     decimalScale: PropTypes.number,
     decimalSeparator: PropTypes.string,
@@ -142,5 +135,14 @@ Input.propTypes = {
     maxLength: PropTypes.number,
     placeholder: PropTypes.string,
   }),
+  onChange: PropTypes.func,
+  onFocus: PropTypes.func,
+  onBlur: PropTypes.func,
+  placeholder: PropTypes.string,
+  readOnly: PropTypes.bool,
   textTransformFunction: PropTypes.func,
+  title: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  type: PropTypes.oneOf(['text', 'number', 'password']),
+  validation: PropTypes.object,
+  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
 }
diff --git a/webapp/components/form/InputChips/store/actions/useRejectSelectedItems.js b/webapp/components/form/InputChips/store/actions/useRejectSelectedItems.js
index cc7622331e..f88ddea403 100644
--- a/webapp/components/form/InputChips/store/actions/useRejectSelectedItems.js
+++ b/webapp/components/form/InputChips/store/actions/useRejectSelectedItems.js
@@ -12,7 +12,7 @@ export const useRejectSelectedItems = () =>
     }
     return async (searchValue) => {
       const itemsRes = await items(searchValue)
-      const itemsArray = Object.values(itemsRes?.data?.items ?? {})
+      const itemsArray = Array.isArray(itemsRes) ? itemsRes : Object.values(itemsRes?.data?.items ?? {})
       return itemsArray.filter(removeSelectedItems)
     }
   }, [])
diff --git a/webapp/components/form/SimpleTextInput.js b/webapp/components/form/SimpleTextInput.js
index 973c4c777a..b2d38e2812 100644
--- a/webapp/components/form/SimpleTextInput.js
+++ b/webapp/components/form/SimpleTextInput.js
@@ -99,7 +99,7 @@ SimpleTextInput.propTypes = {
   startAdornment: PropTypes.any,
   testId: PropTypes.string,
   textTransformFunction: PropTypes.func,
-  title: PropTypes.string,
+  title: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
   type: PropTypes.string,
-  value: PropTypes.string,
+  value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
 }
diff --git a/webapp/components/form/checkbox.js b/webapp/components/form/checkbox.js
index 00523ddcc4..c3ce60bcef 100644
--- a/webapp/components/form/checkbox.js
+++ b/webapp/components/form/checkbox.js
@@ -66,7 +66,7 @@ const Checkbox = (props) => {
         {Objects.isEmpty(label) ? (
           control
         ) : (
-          <MuiFormControlLabel className="full-width" control={control} label={i18n.t(label)} />
+          <MuiFormControlLabel className="width100" control={control} label={i18n.t(label)} />
         )}
         {info && <ButtonIconInfo className="info-icon-btn" title={i18n.t(info)} />}
       </ValidationTooltip>
diff --git a/webapp/components/geo/GeoPolygonInfo.js b/webapp/components/geo/GeoPolygonInfo.js
new file mode 100644
index 0000000000..c83516ac2b
--- /dev/null
+++ b/webapp/components/geo/GeoPolygonInfo.js
@@ -0,0 +1,72 @@
+import './GeoPolygonInfo.scss'
+
+import React, { useCallback, useMemo } from 'react'
+import PropTypes from 'prop-types'
+
+import * as NumberUtils from '@core/numberUtils'
+
+import { useI18n } from '@webapp/store/system'
+import { GeoJsonUtils } from '@webapp/utils/geoJsonUtils'
+
+import { FormItem } from '../form/Input'
+import { ButtonIconInfo } from '../buttons'
+
+const {
+  abbreviationByUnit,
+  areaUnits,
+  formatDecimal,
+  lengthUnits,
+  metersToUnit,
+  roundToPrecision,
+  squareMetersToUnit,
+} = NumberUtils
+
+const formatNumber = (value) => formatDecimal(roundToPrecision(value, 2))
+
+export const GeoPolygonInfo = (props) => {
+  const { geoJson } = props
+
+  const i18n = useI18n()
+
+  const areaInSquareMeters = GeoJsonUtils.area(geoJson)
+  const perimeterInMeters = GeoJsonUtils.perimeter(geoJson)
+
+  const areaInUnit = useCallback(
+    (unit) => `${formatNumber(squareMetersToUnit(unit)(areaInSquareMeters))} ${abbreviationByUnit[unit]}`,
+    [areaInSquareMeters]
+  )
+
+  const areaTooltipContent = useMemo(
+    () => [areaUnits.squareMeter, areaUnits.squareFoot, areaUnits.acre].map(areaInUnit).join('<br>'),
+    [areaInUnit]
+  )
+
+  const perimeterInUnit = useCallback(
+    (unit) => `${formatNumber(metersToUnit(unit)(perimeterInMeters))} ${abbreviationByUnit[unit]}`,
+    [perimeterInMeters]
+  )
+
+  const perimeterTooltipContent = useMemo(() => [lengthUnits.foot].map(perimeterInUnit).join('<br>'), [perimeterInUnit])
+
+  return (
+    <div className="geo-polygon-info">
+      <FormItem label={i18n.t('geo.vertices')}>{GeoJsonUtils.countVertices(geoJson)}</FormItem>
+      <FormItem label={i18n.t('geo.area')}>
+        <div className="row">
+          {areaInUnit(areaUnits.hectare)}
+          <ButtonIconInfo isTitleMarkdown title={areaTooltipContent} />
+        </div>
+      </FormItem>
+      <FormItem label={i18n.t('geo.perimeter')}>
+        <div className="row">
+          {perimeterInUnit(lengthUnits.meter)}
+          <ButtonIconInfo title={perimeterTooltipContent} />
+        </div>
+      </FormItem>
+    </div>
+  )
+}
+
+GeoPolygonInfo.propTypes = {
+  geoJson: PropTypes.object.isRequired,
+}
diff --git a/webapp/components/geo/GeoPolygonInfo.scss b/webapp/components/geo/GeoPolygonInfo.scss
new file mode 100644
index 0000000000..0a19c412b6
--- /dev/null
+++ b/webapp/components/geo/GeoPolygonInfo.scss
@@ -0,0 +1,8 @@
+.geo-polygon-info {
+  display: flex;
+  flex-direction: column;
+
+  .form-item {
+    grid-template-columns: 6rem 1fr;
+  }
+}
diff --git a/webapp/components/survey/NodeDefDetails/AdvancedProps.js b/webapp/components/survey/NodeDefDetails/AdvancedProps.js
index d3b4ab4ef7..15a93d48a2 100644
--- a/webapp/components/survey/NodeDefDetails/AdvancedProps.js
+++ b/webapp/components/survey/NodeDefDetails/AdvancedProps.js
@@ -25,6 +25,7 @@ const AdvancedProps = (props) => {
   const nodeDef = State.getNodeDef(state)
   const validation = State.getValidation(state)
   const nodeDefUuidContext = NodeDef.getParentUuid(nodeDef)
+  const autoIncrementalKey = NodeDef.isAutoIncrementalKey(nodeDef)
 
   const i18n = useI18n()
   const cycle = useSurveyCycleKey()
@@ -79,8 +80,9 @@ const AdvancedProps = (props) => {
             qualifier={TestId.nodeDefDetails.defaultValues}
             state={state}
             Actions={Actions}
+            info={autoIncrementalKey ? 'nodeDefEdit.advancedProps.defaultValuesNotEditableForAutoIncrementalKey' : null}
             label={i18n.t('nodeDefEdit.advancedProps.defaultValues')}
-            readOnly={readOnly}
+            readOnly={readOnly || autoIncrementalKey}
             propName={NodeDef.keysPropsAdvanced.defaultValues}
             nodeDefUuidContext={nodeDefUuidContext}
             canBeConstant
@@ -90,7 +92,7 @@ const AdvancedProps = (props) => {
           <div className="form_row without-label">
             <Checkbox
               checked={NodeDef.isDefaultValueEvaluatedOneTime(nodeDef)}
-              disabled={readOnly}
+              disabled={readOnly || autoIncrementalKey}
               label="nodeDefEdit.advancedProps.defaultValueEvaluatedOneTime"
               validation={Validation.getFieldValidation(NodeDef.keysPropsAdvanced.defaultValueEvaluatedOneTime)(
                 validation
diff --git a/webapp/components/survey/NodeDefDetails/BasicProps/BasicProps.js b/webapp/components/survey/NodeDefDetails/BasicProps/BasicProps.js
index 18c185e784..1b300622eb 100644
--- a/webapp/components/survey/NodeDefDetails/BasicProps/BasicProps.js
+++ b/webapp/components/survey/NodeDefDetails/BasicProps/BasicProps.js
@@ -64,6 +64,7 @@ const BasicProps = (props) => {
     cyclesKeysParent,
     includedInClone,
     includeInCloneDisabled,
+    canHaveAutoIncrementalKey,
   } = useBasicProps(props)
 
   return (
@@ -97,6 +98,17 @@ const BasicProps = (props) => {
                 <ButtonIconInfo title="nodeDefEdit.basicProps.enumerator.info" />
               </span>
             )}
+            {canHaveAutoIncrementalKey && (
+              <FormItem
+                info="nodeDefEdit.basicProps.autoIncrementalKey.info"
+                label={i18n.t('nodeDefEdit.basicProps.autoIncrementalKey.label')}
+              >
+                <Checkbox
+                  checked={NodeDef.isAutoIncrementalKey(nodeDef)}
+                  onChange={(value) => Actions.setProp({ state, key: NodeDef.propKeys.autoIncrementalKey, value })}
+                />
+              </FormItem>
+            )}
           </div>
         </FormItem>
       )}
@@ -113,12 +125,8 @@ const BasicProps = (props) => {
               />
               {NodeDef.isMultipleEntity(nodeDef) && (
                 <FormItem
-                  label={
-                    <span>
-                      {i18n.t('nodeDefEdit.basicProps.enumerate.label')}
-                      <ButtonIconInfo title="nodeDefEdit.basicProps.enumerate.info" />
-                    </span>
-                  }
+                  info="nodeDefEdit.basicProps.enumerate.info"
+                  label={i18n.t('nodeDefEdit.basicProps.enumerate.label')}
                 >
                   <div>
                     <Checkbox
diff --git a/webapp/components/survey/NodeDefDetails/BasicProps/store/useBasicProps.js b/webapp/components/survey/NodeDefDetails/BasicProps/store/useBasicProps.js
index 0bfcb4cf6d..d3727c81f0 100644
--- a/webapp/components/survey/NodeDefDetails/BasicProps/store/useBasicProps.js
+++ b/webapp/components/survey/NodeDefDetails/BasicProps/store/useBasicProps.js
@@ -53,6 +53,12 @@ export const useBasicProps = (props) => {
   const cyclesNodeDef = NodeDef.getCycles(nodeDef)
 
   const nodeDefParentLabel = NodeDef.getLabel(nodeDefParent, lang)
+  const ancestorMultipleEntityDef = Survey.getNodeDefAncestorMultipleEntity(nodeDef)(survey)
+  const canHaveAutoIncrementalKey =
+    NodeDef.isAutoIncrementalKey(nodeDef) ||
+    (NodeDef.canHaveAutoIncrementalKey({ nodeDef, nodeDefParent }) &&
+      ancestorMultipleEntityDef &&
+      !NodeDef.isRoot(ancestorMultipleEntityDef))
 
   return {
     nodeDef,
@@ -73,5 +79,6 @@ export const useBasicProps = (props) => {
     cyclesKeysSurvey,
     includedInClone,
     includeInCloneDisabled,
+    canHaveAutoIncrementalKey,
   }
 }
diff --git a/webapp/components/survey/NodeDefDetails/BasicProps/store/useIsKeyEditDisabled.js b/webapp/components/survey/NodeDefDetails/BasicProps/store/useIsKeyEditDisabled.js
index 17aa768953..cbd9fd9593 100644
--- a/webapp/components/survey/NodeDefDetails/BasicProps/store/useIsKeyEditDisabled.js
+++ b/webapp/components/survey/NodeDefDetails/BasicProps/store/useIsKeyEditDisabled.js
@@ -9,6 +9,7 @@ export const useIsKeyEditDisabled = ({ nodeDef }) => {
     !nodeDef ||
     NodeDef.isRoot(nodeDef) ||
     NodeDef.isMultiple(nodeDef) ||
+    NodeDef.isAutoIncrementalKey(nodeDef) ||
     (!NodeDef.isKey(nodeDef) &&
       Survey.getNodeDefKeys(Survey.getNodeDefParent(nodeDef)(survey))(survey).length >= NodeDef.maxKeyAttributes)
   )
diff --git a/webapp/components/survey/NodeDefDetails/ButtonBar.js b/webapp/components/survey/NodeDefDetails/ButtonBar.js
index f538b7db6f..e691ac96de 100644
--- a/webapp/components/survey/NodeDefDetails/ButtonBar.js
+++ b/webapp/components/survey/NodeDefDetails/ButtonBar.js
@@ -9,9 +9,11 @@ import * as NodeDefLayout from '@core/survey/nodeDefLayout'
 
 import { Button, ButtonDelete } from '@webapp/components/buttons'
 import { NodeDefsActions, useSurveyCycleKey } from '@webapp/store/survey'
+import { useIsEditingNodeDefInFullScreen, useTreeSelectViewMode } from '@webapp/store/ui/surveyForm'
 import { TestId } from '@webapp/utils/testId'
 
 import { State } from './store'
+import { TreeSelectViewMode } from '@webapp/model'
 
 const ButtonBar = (props) => {
   const { state, Actions } = props
@@ -22,6 +24,9 @@ const ButtonBar = (props) => {
   const dispatch = useDispatch()
   const navigate = useNavigate()
   const cycle = useSurveyCycleKey()
+  const editingNodeDefInFullScreen = useIsEditingNodeDefInFullScreen()
+  const treeSelectViewMode = useTreeSelectViewMode()
+  const viewModeAllNodeDefs = treeSelectViewMode === TreeSelectViewMode.allNodeDefs
 
   const previousDefUuid = Actions.getSiblingNodeDefUuid({ state, offset: -1 })
   const nextDefUuid = Actions.getSiblingNodeDefUuid({ state, offset: 1 })
@@ -29,10 +34,10 @@ const ButtonBar = (props) => {
   const saveDisabled = !dirty || StringUtils.isBlank(NodeDef.getName(nodeDef))
 
   const canNavigateNodeDefs =
-    !NodeDef.isRoot(nodeDef) &&
+    (!NodeDef.isRoot(nodeDef) || viewModeAllNodeDefs) &&
     !NodeDef.isTemporary(nodeDef) &&
     !NodeDef.isAnalysis(nodeDef) &&
-    !(NodeDef.isEntity(nodeDef) && NodeDefLayout.isDisplayInOwnPage(cycle)(nodeDef))
+    (!(NodeDef.isEntity(nodeDef) && NodeDefLayout.isDisplayInOwnPage(cycle)(nodeDef)) || viewModeAllNodeDefs)
 
   return (
     <div className="button-bar">
@@ -46,21 +51,34 @@ const ButtonBar = (props) => {
           disabled={!previousDefUuid}
         />
       )}
-      <Button
-        className="btn-cancel"
-        testId={TestId.nodeDefDetails.backBtn}
-        onClick={() => Actions.cancelEdits({ state })}
-        label={dirty ? 'common.cancel' : 'common.back'}
-        variant={dirty ? 'outlined' : 'contained'}
-      />
-      <Button
-        className="btn-primary"
-        testId={TestId.nodeDefDetails.saveAndBackBtn}
-        onClick={() => Actions.saveEdits({ state, goBackOnEnd: true })}
-        disabled={saveDisabled}
-        iconClassName="icon-floppy-disk icon-12px"
-        label="common.saveAndBack"
-      />
+      {editingNodeDefInFullScreen && (
+        <>
+          <Button
+            className="btn-cancel"
+            testId={TestId.nodeDefDetails.backBtn}
+            onClick={() => Actions.cancelEdits({ state })}
+            label={dirty ? 'common.cancel' : 'common.back'}
+            variant={dirty ? 'outlined' : 'contained'}
+          />
+          <Button
+            className="btn-primary"
+            testId={TestId.nodeDefDetails.saveAndBackBtn}
+            onClick={() => Actions.saveEdits({ state, goBackOnEnd: true })}
+            disabled={saveDisabled}
+            iconClassName="icon-floppy-disk icon-12px"
+            label="common.saveAndBack"
+          />
+        </>
+      )}
+      {!editingNodeDefInFullScreen && dirty && (
+        <Button
+          className="btn-cancel"
+          testId={TestId.nodeDefDetails.backBtn}
+          onClick={() => Actions.cancelEdits({ state })}
+          label="common.cancel"
+          variant="outlined"
+        />
+      )}
       <Button
         className="btn-primary"
         testId={TestId.nodeDefDetails.saveBtn}
diff --git a/webapp/components/survey/NodeDefDetails/ExpressionsProp/ExpressionProp.js b/webapp/components/survey/NodeDefDetails/ExpressionsProp/ExpressionProp.js
index 0e83dc9047..5d8d6c7e52 100644
--- a/webapp/components/survey/NodeDefDetails/ExpressionsProp/ExpressionProp.js
+++ b/webapp/components/survey/NodeDefDetails/ExpressionsProp/ExpressionProp.js
@@ -52,9 +52,8 @@ const ExpressionProp = (props) => {
   return (
     <ValidationTooltip validation={validation} showKeys={false}>
       <div className={`node-def-edit__expression${isPlaceholder ? ' placeholder' : ''}`}>
-        {!isPlaceholder && (
+        {!isPlaceholder && !readOnly && (
           <ButtonIconDelete
-            disabled={readOnly}
             id={`expression-editor-${index}-${qualifier}-expression-btn-delete`}
             onClick={() => onDelete(expression)}
             testId={TestId.nodeDefDetails.expressionDeleteBtn(qualifier)}
@@ -79,6 +78,7 @@ const ExpressionProp = (props) => {
             isBoolean={isBoolean}
             types={expressionEditorTypes}
             mode={mode}
+            readOnly={readOnly}
           />
         </div>
 
@@ -98,6 +98,7 @@ const ExpressionProp = (props) => {
               isContextParent={isContextParent}
               canBeCall
               canBeConstant={false}
+              readOnly={readOnly}
               types={expressionEditorTypes}
             />
           </div>
diff --git a/webapp/components/survey/NodeDefDetails/ExpressionsProp/ExpressionsProp.js b/webapp/components/survey/NodeDefDetails/ExpressionsProp/ExpressionsProp.js
index 74c5c54dc2..933e2dbb8b 100644
--- a/webapp/components/survey/NodeDefDetails/ExpressionsProp/ExpressionsProp.js
+++ b/webapp/components/survey/NodeDefDetails/ExpressionsProp/ExpressionsProp.js
@@ -23,6 +23,7 @@ const ExpressionsProp = (props) => {
     hideAdvanced = false,
     isBoolean = true,
     isContextParent = false,
+    info = null,
     label = '',
     mode = Expression.modes.json,
     multiple = true,
@@ -119,7 +120,7 @@ const ExpressionsProp = (props) => {
   )
 
   return (
-    <FormItem label={label} className={classNames({ error: Validation.isNotValid(validation) })}>
+    <FormItem info={info} label={label} className={classNames({ error: Validation.isNotValid(validation) })}>
       <div className="node-def-edit__expressions">
         {values.map((value, index) =>
           createExpressionProp({
@@ -128,7 +129,8 @@ const ExpressionsProp = (props) => {
             validation: Validation.getFieldValidation(index)(validation),
           })
         )}
-        {(multiple || R.isEmpty(values)) &&
+        {!readOnly &&
+          (multiple || R.isEmpty(values)) &&
           createExpressionProp({
             index: values.length,
             expression: NodeDefExpression.createExpressionPlaceholder(),
@@ -144,6 +146,7 @@ ExpressionsProp.propTypes = {
   canBeConstant: PropTypes.bool,
   excludeCurrentNodeDef: PropTypes.bool,
   hideAdvanced: PropTypes.bool,
+  info: PropTypes.string,
   isBoolean: PropTypes.bool,
   isContextParent: PropTypes.bool,
   label: PropTypes.string,
diff --git a/webapp/components/survey/NodeDefDetails/ExpressionsProp/NodeDefExpressionsProp.js b/webapp/components/survey/NodeDefDetails/ExpressionsProp/NodeDefExpressionsProp.js
index ba3712a8a5..b6b667cef6 100644
--- a/webapp/components/survey/NodeDefDetails/ExpressionsProp/NodeDefExpressionsProp.js
+++ b/webapp/components/survey/NodeDefDetails/ExpressionsProp/NodeDefExpressionsProp.js
@@ -18,6 +18,7 @@ const NodeDefExpressionsProp = (props) => {
     canBeConstant = false,
     excludeCurrentNodeDef = false,
     hideAdvanced = false,
+    info = null,
     isBoolean = true,
     isContextParent = false,
     label = '',
@@ -42,6 +43,7 @@ const NodeDefExpressionsProp = (props) => {
   return (
     <ExpressionsProp
       qualifier={qualifier}
+      info={info}
       label={label}
       readOnly={readOnly}
       applyIf={applyIf}
@@ -70,6 +72,7 @@ NodeDefExpressionsProp.propTypes = {
 
   nodeDefUuidContext: PropTypes.string,
   propName: PropTypes.string.isRequired,
+  info: PropTypes.string,
   label: PropTypes.string,
   mode: PropTypes.string,
 
diff --git a/webapp/components/survey/NodeDefDetails/NodeDefDetails.js b/webapp/components/survey/NodeDefDetails/NodeDefDetails.js
index 548c459cff..ff728765ff 100644
--- a/webapp/components/survey/NodeDefDetails/NodeDefDetails.js
+++ b/webapp/components/survey/NodeDefDetails/NodeDefDetails.js
@@ -1,6 +1,8 @@
 import './NodeDefDetails.scss'
 
-import React from 'react'
+import React, { useMemo } from 'react'
+import classNames from 'classnames'
+import PropTypes from 'prop-types'
 
 import * as StringUtils from '@core/stringUtils'
 import * as NodeDef from '@core/survey/nodeDef'
@@ -21,19 +23,56 @@ import AnalysisEntitySelector from './AnalysisEntitySelector'
 
 import { State, useNodeDefDetails } from './store'
 
-const NodeDefDetails = () => {
+const NodeDefDetails = (props) => {
+  const { nodeDefUuid = null } = props
+
   const i18n = useI18n()
 
-  const { state, Actions, editingFromDesigner } = useNodeDefDetails()
+  const { state, Actions, editingFromDesigner } = useNodeDefDetails({ nodeDefUuid })
 
   const nodeDef = State.getNodeDef(state)
+  const nodeDefNull = !nodeDef
+  const nodeDefIsRoot = nodeDef && NodeDef.isRoot(nodeDef)
+  const nodeDefType = nodeDef && NodeDef.getType(nodeDef)
+
+  const tabs = useMemo(() => {
+    if (nodeDefNull) return []
+    const tabProps = { state, Actions, editingFromDesigner }
+    const _tabs = [
+      {
+        label: i18n.t('nodeDefEdit.basic'),
+        component: BasicProps,
+        id: TestId.nodeDefDetails.basic,
+        props: tabProps,
+      },
+    ]
+    if (!nodeDefIsRoot) {
+      _tabs.push({
+        label: i18n.t('nodeDefEdit.advanced'),
+        component: AdvancedProps,
+        id: TestId.nodeDefDetails.advanced,
+        props: tabProps,
+      })
+      if (NodeDefUIProps.getValidationsEnabledByType(nodeDefType)) {
+        _tabs.push({
+          label: i18n.t('nodeDefEdit.validations'),
+          component: ValidationsProps,
+          id: TestId.nodeDefDetails.validations,
+          props: tabProps,
+        })
+      }
+    }
+    return _tabs
+  }, [Actions, editingFromDesigner, i18n, nodeDefIsRoot, nodeDefNull, nodeDefType, state])
+
   if (!nodeDef) return null
 
   const validation = State.getValidation(state)
-  const nodeDefType = NodeDef.getType(nodeDef)
+
+  const className = classNames('node-def-edit', { 'full-screen': !nodeDefUuid })
 
   return (
-    <div className="node-def-edit">
+    <div className={className}>
       <div className="node-def-edit__container">
         {NodeDef.isAnalysis(nodeDef) && (
           <AnalysisEntitySelector
@@ -57,48 +96,7 @@ const NodeDefDetails = () => {
           </div>
         </FormItem>
 
-        <TabBar
-          showTabs={!NodeDef.isAnalysis(nodeDef) && !NodeDef.isRoot(nodeDef)}
-          tabs={[
-            {
-              label: i18n.t('nodeDefEdit.basic'),
-              component: BasicProps,
-              id: TestId.nodeDefDetails.basic,
-              props: {
-                state,
-                Actions,
-                editingFromDesigner,
-              },
-            },
-            ...(NodeDef.isRoot(nodeDef)
-              ? []
-              : [
-                  {
-                    label: i18n.t('nodeDefEdit.advanced'),
-                    component: AdvancedProps,
-                    id: TestId.nodeDefDetails.advanced,
-                    props: {
-                      state,
-                      Actions,
-                    },
-                  },
-
-                  ...(NodeDefUIProps.getValidationsEnabledByType(nodeDefType)
-                    ? [
-                        {
-                          label: i18n.t('nodeDefEdit.validations'),
-                          component: ValidationsProps,
-                          id: TestId.nodeDefDetails.validations,
-                          props: {
-                            state,
-                            Actions,
-                          },
-                        },
-                      ]
-                    : []),
-                ]),
-          ]}
-        />
+        <TabBar showTabs={!NodeDef.isAnalysis(nodeDef) && !NodeDef.isRoot(nodeDef)} tabs={tabs} />
 
         <ButtonBar state={state} Actions={Actions} />
       </div>
@@ -106,4 +104,8 @@ const NodeDefDetails = () => {
   )
 }
 
+NodeDefDetails.propTypes = {
+  nodeDefUuid: PropTypes.string,
+}
+
 export default NodeDefDetails
diff --git a/webapp/components/survey/NodeDefDetails/NodeDefDetails.scss b/webapp/components/survey/NodeDefDetails/NodeDefDetails.scss
index fdaaf73dfc..7afc366823 100644
--- a/webapp/components/survey/NodeDefDetails/NodeDefDetails.scss
+++ b/webapp/components/survey/NodeDefDetails/NodeDefDetails.scss
@@ -1,14 +1,18 @@
 @import 'webapp/style/vars';
 
 .node-def-edit {
-  position: absolute;
+  position: relative;
   width: 100%;
   height: 100%;
-  top: 0px;
-  left: 0px;
-  z-index: $zIndex10TopOfApp;
   background-color: white;
 
+  &.full-screen {
+    position: absolute;
+    top: 0px;
+    left: 0px;
+    z-index: $zIndex10TopOfApp;
+  }
+
   .form_row,
   .form-item_body {
     display: flex;
diff --git a/webapp/components/survey/NodeDefDetails/store/actions/useCancelEdits.js b/webapp/components/survey/NodeDefDetails/store/actions/useCancelEdits.js
index f334e597fb..204a63b382 100644
--- a/webapp/components/survey/NodeDefDetails/store/actions/useCancelEdits.js
+++ b/webapp/components/survey/NodeDefDetails/store/actions/useCancelEdits.js
@@ -4,12 +4,14 @@ import { useNavigate } from 'react-router'
 
 import { DialogConfirmActions } from '@webapp/store/ui'
 import { NodeDefsActions } from '@webapp/store/survey'
+import { useIsEditingNodeDefInFullScreen } from '@webapp/store/ui/surveyForm'
 
 import { State } from '../state'
 
 export const useCancelEdits = ({ setState }) => {
   const navigate = useNavigate()
   const dispatch = useDispatch()
+  const editingNodeDefInFullScreen = useIsEditingNodeDefInFullScreen()
 
   const cancelEdits =
     ({ state }) =>
@@ -17,7 +19,11 @@ export const useCancelEdits = ({ setState }) => {
       const nodeDef = State.getNodeDef(state)
       const nodeDefOriginal = State.getNodeDefOriginal(state)
 
-      await setState(State.reset)
+      if (editingNodeDefInFullScreen) {
+        await setState(State.reset)
+      } else {
+        setState((statePrev) => State.create({ nodeDef: nodeDefOriginal, validation: State.getValidation(statePrev) }))
+      }
 
       await dispatch(NodeDefsActions.cancelEdit({ nodeDef, nodeDefOriginal }))
     }
@@ -30,7 +36,7 @@ export const useCancelEdits = ({ setState }) => {
             .then(() => {
               if (onCancel) {
                 onCancel({ state })
-              } else {
+              } else if (editingNodeDefInFullScreen) {
                 // go back by default
                 navigate(-1)
               }
@@ -50,6 +56,6 @@ export const useCancelEdits = ({ setState }) => {
           _cancel()
         }
       }),
-    []
+    [editingNodeDefInFullScreen]
   )
 }
diff --git a/webapp/components/survey/NodeDefDetails/store/actions/useGetSiblingNodeDefUuid.js b/webapp/components/survey/NodeDefDetails/store/actions/useGetSiblingNodeDefUuid.js
index f39e237799..432d7b2ca2 100644
--- a/webapp/components/survey/NodeDefDetails/store/actions/useGetSiblingNodeDefUuid.js
+++ b/webapp/components/survey/NodeDefDetails/store/actions/useGetSiblingNodeDefUuid.js
@@ -1,5 +1,7 @@
 import { useCallback } from 'react'
 
+import { TraverseMethod } from '@openforis/arena-core'
+
 import * as Survey from '@core/survey/survey'
 import * as NodeDef from '@core/survey/nodeDef'
 import * as NodeDefLayout from '@core/survey/nodeDefLayout'
@@ -7,10 +9,12 @@ import * as NodeDefLayout from '@core/survey/nodeDefLayout'
 import { useSurvey, useSurveyCycleKey } from '@webapp/store/survey'
 
 import { State } from '../state'
+import { useIsEditingNodeDefInFullScreen } from '@webapp/store/ui/surveyForm'
 
 export const useGetSiblingNodeDefUuid = () => {
   const survey = useSurvey()
   const cycle = useSurveyCycleKey()
+  const editingNodeDefInFullScreen = useIsEditingNodeDefInFullScreen()
 
   const getSinglingNodeDefUuids = useCallback(
     ({ nodeDef }) => {
@@ -33,14 +37,22 @@ export const useGetSiblingNodeDefUuid = () => {
     [survey, cycle]
   )
 
+  const getAllSurveyNodeDefUuids = useCallback(
+    () =>
+      Survey.getNodeDefDescendantsAndSelf({ cycle, traverseMethod: TraverseMethod.dfs })(survey).map(NodeDef.getUuid),
+    [cycle, survey]
+  )
+
   return useCallback(
     ({ state, offset }) => {
       const nodeDef = State.getNodeDef(state)
-      const siblingUuids = getSinglingNodeDefUuids({ nodeDef })
+      const siblingUuids = editingNodeDefInFullScreen
+        ? getSinglingNodeDefUuids({ nodeDef })
+        : getAllSurveyNodeDefUuids()
 
       const nodeDefIndex = siblingUuids.indexOf(NodeDef.getUuid(nodeDef))
       return siblingUuids[nodeDefIndex + offset]
     },
-    [getSinglingNodeDefUuids]
+    [editingNodeDefInFullScreen, getAllSurveyNodeDefUuids, getSinglingNodeDefUuids]
   )
 }
diff --git a/webapp/components/survey/NodeDefDetails/store/actions/useGoToNodeDef.js b/webapp/components/survey/NodeDefDetails/store/actions/useGoToNodeDef.js
index 4249a2eed8..702635ec45 100644
--- a/webapp/components/survey/NodeDefDetails/store/actions/useGoToNodeDef.js
+++ b/webapp/components/survey/NodeDefDetails/store/actions/useGoToNodeDef.js
@@ -1,29 +1,40 @@
 import { useCallback } from 'react'
 import { useNavigate } from 'react-router'
+import { useDispatch } from 'react-redux'
 
 import { appModuleUri, designerModules } from '@webapp/app/appModules'
 
 import { useCancelEdits } from './useCancelEdits'
 import { useGetSiblingNodeDefUuid } from './useGetSiblingNodeDefUuid'
+import { SurveyFormActions, useIsEditingNodeDefInFullScreen } from '@webapp/store/ui/surveyForm'
 
 export const useGoToNodeDef = ({ setState }) => {
+  const dispatch = useDispatch()
   const navigate = useNavigate()
+  const editingNodeDefInFullScreen = useIsEditingNodeDefInFullScreen()
 
   const cancelEdits = useCancelEdits({ setState })
 
   const getSiblingNodeDefUuid = useGetSiblingNodeDefUuid()
 
-  return useCallback(async ({ state, offset }) => {
-    cancelEdits({
-      state,
-      offset,
-      onCancel: ({ state }) => {
-        const nodeDefUuidSibling = getSiblingNodeDefUuid({ state, offset })
-        // wait for local state to reset and navigate to the next node def
-        setTimeout(() => {
-          navigate(`${appModuleUri(designerModules.nodeDef)}${nodeDefUuidSibling}/`, { replace: true })
-        }, 100)
-      },
-    })
-  }, [])
+  return useCallback(
+    async ({ state, offset }) => {
+      cancelEdits({
+        state,
+        offset,
+        onCancel: ({ state }) => {
+          const nodeDefUuidSibling = getSiblingNodeDefUuid({ state, offset })
+          if (editingNodeDefInFullScreen) {
+            // wait for local state to reset and navigate to the next node def
+            setTimeout(() => {
+              navigate(`${appModuleUri(designerModules.nodeDef)}${nodeDefUuidSibling}/`, { replace: true })
+            }, 100)
+          } else {
+            dispatch(SurveyFormActions.setFormActiveNodeDefUuid(nodeDefUuidSibling))
+          }
+        },
+      })
+    },
+    [editingNodeDefInFullScreen]
+  )
 }
diff --git a/webapp/components/survey/NodeDefDetails/store/actions/useSetProp.js b/webapp/components/survey/NodeDefDetails/store/actions/useSetProp.js
index 6f284bb208..a11e85ed42 100644
--- a/webapp/components/survey/NodeDefDetails/store/actions/useSetProp.js
+++ b/webapp/components/survey/NodeDefDetails/store/actions/useSetProp.js
@@ -1,6 +1,7 @@
 import { useCallback } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 
+import * as A from '@core/arena'
 import * as StringUtils from '@core/stringUtils'
 import * as Survey from '@core/survey/survey'
 import * as NodeDef from '@core/survey/nodeDef'
@@ -73,14 +74,28 @@ const _generateLabelFromName = (name) => {
   return parts.join(' ')
 }
 
-const _onUpdateName = ({ nodeDef, nodeDefPrev, value: name, lang }) => {
+const _onUpdateName = ({ survey, nodeDef, nodeDefPrev, value: name, lang }) => {
+  let nodeDefUpdated = nodeDef
   const prevNameCapitalized = _generateLabelFromName(NodeDef.getName(nodeDefPrev))
   const prevLabel = NodeDef.getLabel(nodeDef, lang, NodeDef.NodeDefLabelTypes.label, false)
   if (StringUtils.isBlank(prevLabel) || prevNameCapitalized === prevLabel) {
     const nameCapitalized = _generateLabelFromName(name)
-    return NodeDef.assocLabel({ label: nameCapitalized, lang })(nodeDef)
+    nodeDefUpdated = NodeDef.assocLabel({ label: nameCapitalized, lang })(nodeDefUpdated)
   }
-  return nodeDef
+  if (NodeDef.isAutoIncrementalKey(nodeDefUpdated)) {
+    // re-generate default values; they depend on current node def name
+    nodeDefUpdated = _onUpdateAutoIncrementalKey({ survey, nodeDef, value: true })
+  }
+  return nodeDefUpdated
+}
+
+const _onUpdateAutoIncrementalKey = ({ survey, nodeDef, value }) => {
+  const nodeDefParent = Survey.getNodeDefParent(nodeDef)(survey)
+  const defaultValues = value ? NodeDef.createAutoIncrementalKeyDefaultValues({ nodeDef, nodeDefParent }) : []
+  return A.pipe(
+    NodeDef.assocDefaultValues(defaultValues),
+    NodeDef.assocDefaultValueEvaluatedOnlyOneTime(value)
+  )(nodeDef)
 }
 
 const updateFunctionByProp = {
@@ -88,6 +103,7 @@ const updateFunctionByProp = {
   [NodeDef.propKeys.multiple]: _onUpdateMultiple,
   [NodeDef.propKeys.name]: _onUpdateName,
   [NodeDef.propKeys.readOnly]: _onUpdateReadOnly,
+  [NodeDef.propKeys.autoIncrementalKey]: _onUpdateAutoIncrementalKey,
 }
 
 export const useSetProp = ({ setState }) => {
diff --git a/webapp/components/survey/NodeDefDetails/store/actions/useValidate.js b/webapp/components/survey/NodeDefDetails/store/actions/useValidate.js
index 0fc72f314b..0a05a224aa 100644
--- a/webapp/components/survey/NodeDefDetails/store/actions/useValidate.js
+++ b/webapp/components/survey/NodeDefDetails/store/actions/useValidate.js
@@ -17,10 +17,15 @@ export const useValidate = ({ setState }) => {
     const surveyUpdated = Survey.assocNodeDef({ nodeDef: nodeDefUpdated })(survey)
 
     // Update local state immediately (see issue #3240)
-    setState(State.assocNodeDef(nodeDefUpdated))
+    let dirty = false
+    setState((statePrev) => {
+      const stateNext = State.assocNodeDef(nodeDefUpdated)(statePrev)
+      dirty = State.isDirty(stateNext)
+      return stateNext
+    })
 
     // // Dispatch update action
-    dispatch(NodeDefsActions.updateNodeDef({ nodeDef: nodeDefUpdated }))
+    dispatch(NodeDefsActions.updateNodeDef({ nodeDef: nodeDefUpdated, dirty }))
 
     // // Validate node def
     const validation = await SurveyValidator.validateNodeDef(surveyUpdated, nodeDefUpdated)
diff --git a/webapp/components/survey/NodeDefDetails/store/useNodeDefDetails.js b/webapp/components/survey/NodeDefDetails/store/useNodeDefDetails.js
index 5e8144d882..1782bd6a30 100644
--- a/webapp/components/survey/NodeDefDetails/store/useNodeDefDetails.js
+++ b/webapp/components/survey/NodeDefDetails/store/useNodeDefDetails.js
@@ -10,8 +10,11 @@ import { useActions } from './actions'
 import { State } from './state'
 import { useNodeDefValidationByUuid } from '@webapp/store/survey/hooks'
 
-export const useNodeDefDetails = () => {
-  const { nodeDefUuid } = useParams()
+export const useNodeDefDetails = (props) => {
+  const { nodeDefUuid: nodeDefUuidProp } = props
+  const { nodeDefUuid: nodeDefUuidParam } = useParams()
+
+  const nodeDefUuid = nodeDefUuidProp ?? nodeDefUuidParam
 
   const navigate = useNavigate()
 
diff --git a/webapp/components/survey/NodeDefsSelector/EntitySelectorTree/index.js b/webapp/components/survey/NodeDefsSelector/EntitySelectorTree/index.js
deleted file mode 100644
index fa51fedc77..0000000000
--- a/webapp/components/survey/NodeDefsSelector/EntitySelectorTree/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { EntitySelectorTree } from './EntitySelectorTree'
diff --git a/webapp/components/survey/NodeDefsSelector/EntitySelectorTree/EntitySelectorTree.js b/webapp/components/survey/NodeDefsSelector/NodeDefTreeSelect/NodeDefTreeSelect.js
similarity index 50%
rename from webapp/components/survey/NodeDefsSelector/EntitySelectorTree/EntitySelectorTree.js
rename to webapp/components/survey/NodeDefsSelector/NodeDefTreeSelect/NodeDefTreeSelect.js
index 41ec19d127..35c10dc147 100644
--- a/webapp/components/survey/NodeDefsSelector/EntitySelectorTree/EntitySelectorTree.js
+++ b/webapp/components/survey/NodeDefsSelector/NodeDefTreeSelect/NodeDefTreeSelect.js
@@ -1,4 +1,4 @@
-import './EntitySelectorTree.scss'
+import './NodeDefTreeSelect.scss'
 
 import React from 'react'
 import PropTypes from 'prop-types'
@@ -6,15 +6,17 @@ import classNames from 'classnames'
 
 import { Button } from '@webapp/components/buttons'
 import { TreeView } from '@webapp/components/TreeView'
-import { useEntitySelectorTree } from './useEntitySelectorTree'
+import { useNodeDefTreeSelect } from './useNodeDefTreeSelect'
 
-const EntitySelectorTree = (props) => {
+const NodeDefTreeSelect = (props) => {
   const {
     getLabelSuffix = () => '',
     isDisabled = () => false,
+    includeMultipleAttributes = false,
+    includeSingleAttributes = false,
+    includeSingleEntities = false,
     nodeDefLabelType = null,
     nodeDefUuidActive = null,
-    onlyEntities = true,
     onlyPages = false,
     onSelect,
   } = props
@@ -27,31 +29,37 @@ const EntitySelectorTree = (props) => {
     setExpandedNodeDefUuids,
     toggleExpanded,
     treeItems,
-  } = useEntitySelectorTree({
+  } = useNodeDefTreeSelect({
     getLabelSuffix,
     isDisabled,
     nodeDefLabelType,
     nodeDefUuidActive,
-    onlyEntities,
+    includeMultipleAttributes,
+    includeSingleAttributes,
+    includeSingleEntities,
     onlyPages,
     onSelect,
   })
 
+  const collapseButtonVisible = treeItems?.length >= 1 && treeItems[0].items?.length > 0
+
   return (
-    <div className="entity-selector-tree">
-      <div className="display-flex">
-        <Button
-          className="btn-toggle btn-expand"
-          iconClassName={classNames('icon icon-12px', {
-            'icon-shrink2': expanded,
-            'icon-enlarge2': !expanded,
-          })}
-          onClick={toggleExpanded}
-          size="small"
-          title={expanded ? 'common.collapse' : 'common.expand'}
-          variant="text"
-        />
-      </div>
+    <div className="nodedef-tree-select">
+      {collapseButtonVisible && (
+        <div className="display-flex">
+          <Button
+            className="btn-toggle btn-expand"
+            iconClassName={classNames('icon icon-12px', {
+              'icon-shrink2': expanded,
+              'icon-enlarge2': !expanded,
+            })}
+            onClick={toggleExpanded}
+            size="small"
+            title={expanded ? 'common.collapse' : 'common.expand'}
+            variant="text"
+          />
+        </div>
+      )}
 
       <TreeView
         expadedItemKeys={expandedNodeDefUuids}
@@ -64,14 +72,16 @@ const EntitySelectorTree = (props) => {
   )
 }
 
-EntitySelectorTree.propTypes = {
+NodeDefTreeSelect.propTypes = {
   getLabelSuffix: PropTypes.func,
   isDisabled: PropTypes.func,
   nodeDefLabelType: PropTypes.string,
   nodeDefUuidActive: PropTypes.string,
-  onlyEntities: PropTypes.bool,
+  includeMultipleAttributes: PropTypes.bool,
+  includeSingleAttributes: PropTypes.bool,
+  includeSingleEntities: PropTypes.bool,
   onlyPages: PropTypes.bool,
   onSelect: PropTypes.func.isRequired,
 }
 
-export { EntitySelectorTree }
+export { NodeDefTreeSelect }
diff --git a/webapp/components/survey/NodeDefsSelector/EntitySelectorTree/EntitySelectorTree.scss b/webapp/components/survey/NodeDefsSelector/NodeDefTreeSelect/NodeDefTreeSelect.scss
similarity index 84%
rename from webapp/components/survey/NodeDefsSelector/EntitySelectorTree/EntitySelectorTree.scss
rename to webapp/components/survey/NodeDefsSelector/NodeDefTreeSelect/NodeDefTreeSelect.scss
index 32fa6e33a4..15686dff1a 100644
--- a/webapp/components/survey/NodeDefsSelector/EntitySelectorTree/EntitySelectorTree.scss
+++ b/webapp/components/survey/NodeDefsSelector/NodeDefTreeSelect/NodeDefTreeSelect.scss
@@ -1,4 +1,4 @@
-.entity-selector-tree {
+.nodedef-tree-select {
   position: relative;
   overflow-y: auto;
 
diff --git a/webapp/components/survey/NodeDefsSelector/NodeDefTreeSelect/index.js b/webapp/components/survey/NodeDefsSelector/NodeDefTreeSelect/index.js
new file mode 100644
index 0000000000..39a2634752
--- /dev/null
+++ b/webapp/components/survey/NodeDefsSelector/NodeDefTreeSelect/index.js
@@ -0,0 +1 @@
+export { NodeDefTreeSelect } from './NodeDefTreeSelect'
diff --git a/webapp/components/survey/NodeDefsSelector/EntitySelectorTree/useBuildEntityTreeData.js b/webapp/components/survey/NodeDefsSelector/NodeDefTreeSelect/useBuildEntityTreeData.js
similarity index 73%
rename from webapp/components/survey/NodeDefsSelector/EntitySelectorTree/useBuildEntityTreeData.js
rename to webapp/components/survey/NodeDefsSelector/NodeDefTreeSelect/useBuildEntityTreeData.js
index 13d22762a2..c827a0a466 100644
--- a/webapp/components/survey/NodeDefsSelector/EntitySelectorTree/useBuildEntityTreeData.js
+++ b/webapp/components/survey/NodeDefsSelector/NodeDefTreeSelect/useBuildEntityTreeData.js
@@ -4,6 +4,7 @@ import * as NodeDefLayout from '@core/survey/nodeDefLayout'
 import * as Record from '@core/record/record'
 import * as Node from '@core/record/node'
 
+import * as NodeDefUIProps from '@webapp/components/survey/SurveyForm/nodeDefs/nodeDefUIProps'
 import { useSurvey, useSurveyCycleKey, useSurveyPreferredLang } from '@webapp/store/survey'
 import { useRecord } from '@webapp/store/ui/record'
 import { useNodeDefLabelType, usePagesUuidMap } from '@webapp/store/ui/surveyForm'
@@ -31,7 +32,9 @@ const getNodeDefAvailableChildren = ({
   nodeDef,
   record,
   onlyPages,
-  onlyEntities,
+  includeMultipleAttributes,
+  includeSingleAttributes,
+  includeSingleEntities,
   isDisabled,
 }) => {
   const pageNode = getPageNode({ record, pagesUuidMap, nodeDefUuid: NodeDef.getUuid(nodeDef) })
@@ -43,18 +46,33 @@ const getNodeDefAvailableChildren = ({
     parentPageNode &&
     !isPageVisible({ cycle, record, pageNodeDef: nodeDef, parentNode: parentPageNode })
 
-  const childrenPageDefs = onlyPages
-    ? Survey.getNodeDefChildrenInOwnPage({ nodeDef, cycle })(survey)
-    : Survey.getNodeDefDescendantsInSingleEntities({
-        cycle,
-        nodeDef,
-        sorted: true,
-        filterFn: onlyEntities ? NodeDef.isMultipleEntity : NodeDef.isMultiple,
-      })(survey)
+  let children = null
+  if (onlyPages) {
+    children = Survey.getNodeDefChildrenInOwnPage({ nodeDef, cycle })(survey)
+  } else if (includeSingleEntities) {
+    children = Survey.getNodeDefChildrenSorted({ nodeDef, cycle })(survey)
+  } else {
+    children = Survey.getNodeDefDescendantsInSingleEntities({
+      cycle,
+      nodeDef,
+      sorted: true,
+    })(survey)
+  }
+  const childrenFiltered = children.filter((nodeDef) => {
+    const multiple = NodeDef.isMultiple(nodeDef)
+    if (multiple) {
+      return NodeDef.isEntity(nodeDef) || includeMultipleAttributes
+    } else {
+      return (
+        (includeSingleEntities && NodeDef.isEntity(nodeDef)) ||
+        (includeSingleAttributes && NodeDef.isAttribute(nodeDef))
+      )
+    }
+  })
 
   const visibleChildren = pageNode
-    ? childrenPageDefs.filter((childDef) => isPageVisible({ pageNodeDef: childDef, parentNode: pageNode }))
-    : childrenPageDefs
+    ? childrenFiltered.filter((childDef) => isPageVisible({ pageNodeDef: childDef, parentNode: pageNode }))
+    : childrenFiltered
 
   return visibleChildren.filter((childDef) => !isDisabled(childDef) && !hidden)
 }
@@ -63,7 +81,9 @@ export const useBuildTreeData = ({
   nodeDefLabelType: nodeDefLabelTypeProp,
   getLabelSuffix,
   onlyPages,
-  onlyEntities,
+  includeMultipleAttributes,
+  includeSingleAttributes,
+  includeSingleEntities,
   isDisabled,
 }) => {
   const survey = useSurvey()
@@ -73,6 +93,7 @@ export const useBuildTreeData = ({
   const pagesUuidMap = usePagesUuidMap()
   const nodeDefLabelTypeInStore = useNodeDefLabelType()
   const nodeDefLabelType = nodeDefLabelTypeProp ?? nodeDefLabelTypeInStore
+  const showIcons = includeSingleAttributes
 
   const stack = []
 
@@ -84,6 +105,7 @@ export const useBuildTreeData = ({
     const suffix = getLabelSuffix(nodeDef)
     return {
       key: NodeDef.getUuid(nodeDef),
+      icon: showIcons ? NodeDefUIProps.getIconByNodeDef(nodeDef, true) : undefined,
       label: `${nodeDefLabel}${suffix}`,
       testId: TestId.surveyForm.pageLinkBtn(NodeDef.getName(nodeDef)),
     }
@@ -113,7 +135,9 @@ export const useBuildTreeData = ({
       nodeDef,
       record,
       onlyPages,
-      onlyEntities,
+      includeMultipleAttributes,
+      includeSingleAttributes,
+      includeSingleEntities,
       isDisabled,
     })
     if (children.length > 0) {
diff --git a/webapp/components/survey/NodeDefsSelector/EntitySelectorTree/useEntitySelectorTree.js b/webapp/components/survey/NodeDefsSelector/NodeDefTreeSelect/useNodeDefTreeSelect.js
similarity index 67%
rename from webapp/components/survey/NodeDefsSelector/EntitySelectorTree/useEntitySelectorTree.js
rename to webapp/components/survey/NodeDefsSelector/NodeDefTreeSelect/useNodeDefTreeSelect.js
index deb333e704..0d10f67bfd 100644
--- a/webapp/components/survey/NodeDefsSelector/EntitySelectorTree/useEntitySelectorTree.js
+++ b/webapp/components/survey/NodeDefsSelector/NodeDefTreeSelect/useNodeDefTreeSelect.js
@@ -5,17 +5,30 @@ import * as Survey from '@core/survey/survey'
 import { useSurvey } from '@webapp/store/survey'
 import { useBuildTreeData } from './useBuildEntityTreeData'
 
-export const useEntitySelectorTree = (props) => {
-  const { getLabelSuffix, isDisabled, nodeDefLabelType, nodeDefUuidActive, onlyEntities, onlyPages, onSelect } = props
+export const useNodeDefTreeSelect = (props) => {
+  const {
+    getLabelSuffix,
+    isDisabled,
+    nodeDefLabelType,
+    nodeDefUuidActive,
+    includeMultipleAttributes,
+    includeSingleAttributes,
+    includeSingleEntities,
+    onlyPages,
+    onSelect,
+  } = props
   const survey = useSurvey()
 
   const { treeItems, treeItemKeys } = useBuildTreeData({
     nodeDefLabelType,
     getLabelSuffix,
     onlyPages,
-    onlyEntities,
+    includeMultipleAttributes,
+    includeSingleAttributes,
+    includeSingleEntities,
     isDisabled,
   })
+  const rootItemKey = treeItems[0]?.key
 
   const [expanded, setExpanded] = useState(true)
   const [expandedNodeDefUuids, setExpandedNodeDefUuids] = useState(treeItemKeys)
@@ -24,12 +37,9 @@ export const useEntitySelectorTree = (props) => {
   const toggleExpanded = useCallback(() => {
     const expandedNext = !expanded
     setExpanded(expandedNext)
-    if (expandedNext) {
-      setExpandedNodeDefUuids(treeItemKeys)
-    } else {
-      setExpandedNodeDefUuids([])
-    }
-  }, [expanded, treeItemKeys])
+    const itemKeysToExpand = expandedNext ? treeItemKeys : [rootItemKey]
+    setExpandedNodeDefUuids(itemKeysToExpand)
+  }, [expanded, rootItemKey, treeItemKeys])
 
   const onSelectedTreeItemKeyChange = useCallback(
     (selectedNodeDefUuid) => {
diff --git a/webapp/components/survey/NodeDefsSelector/index.js b/webapp/components/survey/NodeDefsSelector/index.js
index 73cb50bf51..e803d41a05 100644
--- a/webapp/components/survey/NodeDefsSelector/index.js
+++ b/webapp/components/survey/NodeDefsSelector/index.js
@@ -4,7 +4,7 @@ export { default as NodeDefsSelectorAggregate } from './NodeDefsSelectorAggregat
 
 export { default as EntitySelector } from './EntitySelector'
 
-export { EntitySelectorTree } from './EntitySelectorTree'
+export { NodeDefTreeSelect } from './NodeDefTreeSelect'
 
 export { default as AttributesSelector } from './AttributesSelector'
 export { default as AttributeSelector } from './AttributesSelector/AttributeSelector'
diff --git a/webapp/components/survey/SurveyForm/FormHeader/FormHeader.js b/webapp/components/survey/SurveyForm/FormHeader/FormHeader.js
index bef6323f8a..9daaa19bdc 100644
--- a/webapp/components/survey/SurveyForm/FormHeader/FormHeader.js
+++ b/webapp/components/survey/SurveyForm/FormHeader/FormHeader.js
@@ -7,6 +7,7 @@ import * as NodeDef from '@core/survey/nodeDef'
 import * as NodeDefLayout from '@core/survey/nodeDefLayout'
 import { uuidv4 } from '@core/uuid'
 
+import { TreeSelectViewMode } from '@webapp/model'
 import { JobActions } from '@webapp/store/app'
 import { NodeDefsActions, SurveyActions, useSurveyCycleKey, useSurveyId } from '@webapp/store/survey'
 import { useAuthCanEditSurvey } from '@webapp/store/user'
@@ -15,6 +16,7 @@ import {
   useNodeDefLabelType,
   useNodeDefPage,
   useShowPageNavigation,
+  useTreeSelectViewMode,
 } from '@webapp/store/ui/surveyForm'
 import { TestId } from '@webapp/utils/testId'
 
@@ -43,6 +45,7 @@ const FormHeader = (props) => {
   const showPageNavigation = useShowPageNavigation()
   const canEditSurvey = useAuthCanEditSurvey()
   const path = usePath(entry)
+  const treeViewMode = useTreeSelectViewMode()
 
   const onLabelsImportFileSelected = useCallback(
     async (file) => {
@@ -73,7 +76,7 @@ const FormHeader = (props) => {
           <span className={`icon icon-${showPageNavigation ? 'shrink2' : 'enlarge2'} icon-12px`} />
         </Button>
 
-        {edit && canEditDef && (
+        {edit && canEditDef && treeViewMode === TreeSelectViewMode.onlyPages && (
           <Button
             iconClassName="icon-plus icon-12px"
             label="surveyForm.subPage"
diff --git a/webapp/components/survey/SurveyForm/SurveyForm.js b/webapp/components/survey/SurveyForm/SurveyForm.js
index 18c0800d0a..adfdac1d6e 100644
--- a/webapp/components/survey/SurveyForm/SurveyForm.js
+++ b/webapp/components/survey/SurveyForm/SurveyForm.js
@@ -1,17 +1,26 @@
 import './SurveyForm.scss'
 import './react-grid-layout.scss'
 
-import React, { useEffect } from 'react'
+import React, { useCallback, useEffect } from 'react'
 import { connect, useDispatch } from 'react-redux'
+import classNames from 'classnames'
+import PropTypes from 'prop-types'
 
 import * as Survey from '@core/survey/survey'
 import * as NodeDef from '@core/survey/nodeDef'
 import * as NodeDefLayout from '@core/survey/nodeDefLayout'
 import * as Record from '@core/record/record'
+import * as ProcessUtils from '@core/processUtils'
 
 import { appModuleUri, designerModules } from '@webapp/app/appModules'
 import { SurveyState, useSurvey } from '@webapp/store/survey'
-import { SurveyFormActions, SurveyFormState, useNotAvailableEntityPageUuids } from '@webapp/store/ui/surveyForm'
+import {
+  SurveyFormActions,
+  SurveyFormState,
+  useActiveNodeDefUuid,
+  useNotAvailableEntityPageUuids,
+  useTreeSelectViewMode,
+} from '@webapp/store/ui/surveyForm'
 import { RecordState } from '@webapp/store/ui/record'
 import { useI18n } from '@webapp/store/system'
 import { useIsSidebarOpened } from '@webapp/service/storage/sidebar'
@@ -19,25 +28,32 @@ import { TestId } from '@webapp/utils/testId'
 import { dispatchWindowResize } from '@webapp/utils/domUtils'
 import { useOnUpdate, useLocationPathMatcher } from '@webapp/components/hooks'
 
-import { EntitySelectorTree } from '@webapp/components/survey/NodeDefsSelector'
+import { NodeDefTreeSelect } from '@webapp/components/survey/NodeDefsSelector'
 
 import { Split } from '@webapp/components'
+import { ButtonGroup } from '@webapp/components/form'
+import { TreeSelectViewMode } from '@webapp/model'
+
+import NodeDefDetails from '../NodeDefDetails'
 import { FormPagesEditButtons } from './components/FormPageEditButtons'
-import FormHeader from './FormHeader'
 import AddNodeDefPanel from './components/addNodeDefPanel'
 import NodeDefSwitch from './nodeDefs/nodeDefSwitch'
+import FormHeader from './FormHeader'
 
 const hasChildrenInSamePage = ({ survey, surveyCycleKey, nodeDef }) =>
   Survey.getNodeDefChildren(nodeDef)(survey).filter((childDef) =>
     NodeDefLayout.isDisplayInParentPage(surveyCycleKey)(childDef)
   ).length > 0
 
+const treeSelectViewModeItems = Object.keys(TreeSelectViewMode).map((mode) => ({
+  key: mode,
+  label: `surveyForm.nodeDefsTreeSelectMode.${mode}`,
+}))
+
 const SurveyForm = (props) => {
   const {
     analysis = false,
     surveyInfo = null,
-    // Current nodeDef page
-    nodeDef = null,
     // Form in edit mode
     edit = false,
     // Form in data entry mode
@@ -50,6 +66,7 @@ const SurveyForm = (props) => {
     recordUuid = null,
 
     surveyCycleKey,
+    activePageNodeDef,
     hasNodeDefAddChildTo,
     showPageNavigation,
     canEditRecord,
@@ -62,12 +79,18 @@ const SurveyForm = (props) => {
 
   const isSideBarOpened = useIsSidebarOpened()
   const survey = useSurvey()
+  const treeSelectViewMode = useTreeSelectViewMode()
+  const viewOnlyPages = treeSelectViewMode === TreeSelectViewMode.onlyPages
+  const selectedNodeDefUuid = useActiveNodeDefUuid()
+
   const editAllowed = edit && canEditDef
 
-  let className = editAllowed ? ' edit' : ''
-  className += hasNodeDefAddChildTo ? '' : ' form-actions-off'
-  className += showPageNavigation ? '' : ' page-navigation-off'
-  className += preview ? ' form-preview' : ''
+  const className = classNames('survey-form', {
+    edit: editAllowed,
+    'form-actions-off': !hasNodeDefAddChildTo,
+    'page-navigation-off': !showPageNavigation,
+    'form-preview': preview,
+  })
 
   // If showPageNavigation, addNodeDefAddChildTo or sideBar change, trigger window resize to re-render react-grid-layout form
   useOnUpdate(() => {
@@ -94,10 +117,10 @@ const SurveyForm = (props) => {
     if (
       editAllowed &&
       !hasNodeDefAddChildTo &&
-      NodeDef.isEntity(nodeDef) &&
-      !hasChildrenInSamePage({ survey, surveyCycleKey, nodeDef })
+      NodeDef.isEntity(activePageNodeDef) &&
+      !hasChildrenInSamePage({ survey, surveyCycleKey, nodeDef: activePageNodeDef })
     ) {
-      dispatch(SurveyFormActions.setFormNodeDefAddChildTo(nodeDef))
+      dispatch(SurveyFormActions.setFormNodeDefAddChildTo(activePageNodeDef))
     }
 
     // OnUnmount if it's in editAllowed mode, set nodeDefAddChildTo to null
@@ -123,15 +146,29 @@ const SurveyForm = (props) => {
     }
   }, [])
 
-  if (!nodeDef) {
+  const onNodeDefTreeSelect = useCallback(
+    (nodeDefToSelect) => {
+      if (viewOnlyPages) {
+        const showAddChildTo =
+          NodeDefLayout.isRenderForm(surveyCycleKey)(nodeDefToSelect) &&
+          !hasChildrenInSamePage({ survey, surveyCycleKey, nodeDef: nodeDefToSelect })
+        dispatch(SurveyFormActions.setFormActivePage({ nodeDef: nodeDefToSelect, showAddChildTo }))
+      } else {
+        dispatch(SurveyFormActions.setFormActiveNodeDefUuid(NodeDef.getUuid(nodeDefToSelect)))
+      }
+    },
+    [dispatch, survey, surveyCycleKey, viewOnlyPages]
+  )
+
+  if (!activePageNodeDef) {
     return null
   }
 
-  const internalContainer = (
+  const internalContainer = viewOnlyPages ? (
     <NodeDefSwitch
       surveyInfo={surveyInfo}
       surveyCycleKey={surveyCycleKey}
-      nodeDef={nodeDef}
+      nodeDef={activePageNodeDef}
       edit={edit}
       entry={entry}
       preview={preview}
@@ -140,32 +177,40 @@ const SurveyForm = (props) => {
       canEditDef={canEditDef}
       canEditRecord={canEditRecord}
     />
+  ) : (
+    <NodeDefDetails nodeDefUuid={selectedNodeDefUuid} />
   )
 
   return (
     <div className="survey-form-wrapper">
       <FormHeader edit={edit} analysis={analysis} entry={entry} preview={preview} canEditDef={canEditDef} />
 
-      <div className={`survey-form${className}`} data-testid={TestId.surveyForm.surveyForm}>
+      <div className={className} data-testid={TestId.surveyForm.surveyForm}>
         {preview && <div className="preview-label">{i18n.t('common.preview')}</div>}
         {showPageNavigation && (
           <Split sizes={[20, 80]} minSize={[0, 300]}>
             <div className="survey-form__sidebar">
-              <EntitySelectorTree
+              <NodeDefTreeSelect
                 isDisabled={(nodeDefArg) => notAvailablePageEntityDefsUuids.includes(NodeDef.getUuid(nodeDefArg))}
-                nodeDefUuidActive={NodeDef.getUuid(nodeDef)}
-                onlyPages
-                onSelect={(nodeDefToSelect) => {
-                  const showAddChildTo =
-                    NodeDefLayout.isRenderForm(surveyCycleKey)(nodeDefToSelect) &&
-                    !hasChildrenInSamePage({ survey, surveyCycleKey, nodeDef: nodeDefToSelect })
-                  dispatch(SurveyFormActions.setFormActivePage({ nodeDef: nodeDefToSelect, showAddChildTo }))
-                }}
+                nodeDefUuidActive={viewOnlyPages ? NodeDef.getUuid(activePageNodeDef) : selectedNodeDefUuid}
+                onlyPages={viewOnlyPages}
+                includeMultipleAttributes={!viewOnlyPages}
+                includeSingleAttributes={!viewOnlyPages}
+                includeSingleEntities
+                onSelect={onNodeDefTreeSelect}
               />
-
-              {edit && canEditDef && <FormPagesEditButtons />}
+              <div className="display-flex sidebar-bottom-bar">
+                {edit && ProcessUtils.ENV.experimentalFeatures && (
+                  <ButtonGroup
+                    items={treeSelectViewModeItems}
+                    onChange={(mode) => dispatch(SurveyFormActions.setTreeSelectViewMode(mode))}
+                    selectedItemKey={treeSelectViewMode}
+                  />
+                )}
+                {edit && canEditDef && viewOnlyPages && <FormPagesEditButtons />}
+              </div>
             </div>
-            {internalContainer}
+            <div className="survey-form__internal-container-wrapper width100 height100">{internalContainer}</div>
           </Split>
         )}
         {!showPageNavigation && internalContainer}
@@ -178,20 +223,20 @@ const SurveyForm = (props) => {
 const mapStateToProps = (state, props) => {
   const survey = SurveyState.getSurvey(state)
   const surveyInfo = Survey.getSurveyInfo(survey)
-  const nodeDef = SurveyFormState.getFormActivePageNodeDef(state)
+  const activePageNodeDef = SurveyFormState.getFormActivePageNodeDef(state)
   const hasNodeDefAddChildTo = Boolean(SurveyFormState.getNodeDefAddChildTo(state))
   const record = RecordState.getRecord(state)
   const showPageNavigation = SurveyFormState.showPageNavigation(state)
 
   const mapEntryProps = () => ({
-    parentNode: nodeDef ? SurveyFormState.getFormPageParentNode(nodeDef)(state) : null,
+    parentNode: activePageNodeDef ? SurveyFormState.getFormPageParentNode(activePageNodeDef)(state) : null,
     recordUuid: Record.getUuid(record),
   })
 
   return {
     surveyInfo,
     surveyCycleKey: SurveyState.getSurveyCycleKey(state),
-    nodeDef,
+    activePageNodeDef,
     hasNodeDefAddChildTo,
     showPageNavigation,
     analysis: Record.isInAnalysisStep(record),
@@ -199,4 +244,20 @@ const mapStateToProps = (state, props) => {
   }
 }
 
+SurveyForm.propTypes = {
+  activePageNodeDef: PropTypes.object.isRequired,
+  analysis: PropTypes.bool,
+  canEditDef: PropTypes.bool,
+  canEditRecord: PropTypes.bool,
+  edit: PropTypes.bool,
+  entry: PropTypes.bool,
+  hasNodeDefAddChildTo: PropTypes.bool,
+  parentNode: PropTypes.object,
+  preview: PropTypes.bool,
+  recordUuid: PropTypes.string,
+  showPageNavigation: PropTypes.bool,
+  surveyInfo: PropTypes.object.isRequired,
+  surveyCycleKey: PropTypes.string.isRequired,
+}
+
 export default connect(mapStateToProps)(SurveyForm)
diff --git a/webapp/components/survey/SurveyForm/SurveyForm.scss b/webapp/components/survey/SurveyForm/SurveyForm.scss
index 5907f77148..81993c8ead 100644
--- a/webapp/components/survey/SurveyForm/SurveyForm.scss
+++ b/webapp/components/survey/SurveyForm/SurveyForm.scss
@@ -71,30 +71,29 @@
   }
 }
 
-// entity-selector-tree
+// nodedef-tree-select
 .survey-form {
   .survey-form__sidebar {
     height: 100%;
     position: relative;
     overflow-y: auto;
+    display: flex;
+    flex-direction: column;
 
-    .entity-selector-tree {
-      position: absolute;
-      height: 100%;
-      width: 100%;
+    .nodedef-tree-select {
+      flex: 1;
       border: $formBorder;
       background-color: $white;
     }
 
-    .survey-form__page-edit-buttons {
-      position: absolute;
-      bottom: 0;
-      right: 18px;
+    .sidebar-bottom-bar {
+      width: 100%;
+      justify-content: space-between;
     }
   }
 
   &.edit {
-    .entity-selector-tree {
+    .nodedef-tree-select {
       border: $formBorderEdit;
     }
   }
diff --git a/webapp/components/survey/SurveyForm/components/FormPageEditButtons/FormPagesEditButtons.js b/webapp/components/survey/SurveyForm/components/FormPageEditButtons/FormPagesEditButtons.js
index 3d5c6d7bc7..40c04f7820 100644
--- a/webapp/components/survey/SurveyForm/components/FormPageEditButtons/FormPagesEditButtons.js
+++ b/webapp/components/survey/SurveyForm/components/FormPageEditButtons/FormPagesEditButtons.js
@@ -11,14 +11,14 @@ export const FormPagesEditButtons = () => {
       <Button
         size="small"
         iconClassName="icon-arrow-up2 icon-12px"
-        title={'surveyForm.movePageUp'}
+        title="surveyForm.movePageUp"
         disabled={upDisabled}
         onClick={onMoveUp}
       />
       <Button
         size="small"
         iconClassName="icon-arrow-down2 icon-12px"
-        title={'surveyForm.movePageDown'}
+        title="surveyForm.movePageDown"
         disabled={downDisabled}
         onClick={onMoveDown}
       />
diff --git a/webapp/components/survey/SurveyForm/components/addNodeDefPanel.js b/webapp/components/survey/SurveyForm/components/addNodeDefPanel.js
index cf6e717dd6..d2ca2dcd1d 100644
--- a/webapp/components/survey/SurveyForm/components/addNodeDefPanel.js
+++ b/webapp/components/survey/SurveyForm/components/addNodeDefPanel.js
@@ -2,11 +2,11 @@ import './addNodeDefPanel.scss'
 
 import React from 'react'
 import { connect } from 'react-redux'
-import * as R from 'ramda'
 import { useNavigate } from 'react-router'
 
 import { useI18n } from '@webapp/store/system'
 
+import * as ProcessUtils from '@core/processUtils'
 import * as NodeDef from '@core/survey/nodeDef'
 import * as NodeDefLayout from '@core/survey/nodeDefLayout'
 import { SurveyState, NodeDefsActions } from '@webapp/store/survey'
@@ -15,14 +15,20 @@ import { TestId } from '@webapp/utils/testId'
 
 import * as NodeDefUIProps from '../nodeDefs/nodeDefUIProps'
 
+const experimentalNodeDefTypes = [NodeDef.nodeDefType.geo]
+
 const AddNodeDefButtons = (props) => {
   const { surveyCycleKey, nodeDef, addNodeDef } = props
 
   const i18n = useI18n()
 
+  const availableNodeDefTypes = Object.values(NodeDef.nodeDefType).filter(
+    (type) => ProcessUtils.ENV.experimentalFeatures || !experimentalNodeDefTypes.includes(type)
+  )
+
   return (
     <>
-      {R.values(NodeDef.nodeDefType).map((type) => {
+      {availableNodeDefTypes.map((type) => {
         const nodeDefProps = NodeDefUIProps.getDefaultPropsByType(type, surveyCycleKey)
 
         // Cannot add entities when entity is rendered as table
diff --git a/webapp/components/survey/SurveyForm/nodeDefs/components/nodeDefConversionDialog.js b/webapp/components/survey/SurveyForm/nodeDefs/components/nodeDefConversionDialog.js
index af37863897..7354231c3d 100644
--- a/webapp/components/survey/SurveyForm/nodeDefs/components/nodeDefConversionDialog.js
+++ b/webapp/components/survey/SurveyForm/nodeDefs/components/nodeDefConversionDialog.js
@@ -32,7 +32,9 @@ export const NodeDefConversionDialog = (props) => {
   const nodeDefName = NodeDef.getName(nodeDef)
   const nodeDefType = NodeDef.getType(nodeDef)
 
-  const availableToTypes = Object.values(NodeDef.nodeDefType).filter((type) => type != NodeDef.getType(nodeDef))
+  const availableToTypes = Object.values(NodeDef.nodeDefType).filter(
+    (type) => ![NodeDef.nodeDefType.entity, NodeDef.getType(nodeDef)].includes(type)
+  )
   const confirmButtonDisabled = !selectedToType
 
   return (
diff --git a/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefBoolean.scss b/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefBoolean.scss
index 53ef6a3eb7..9d8bc2a379 100644
--- a/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefBoolean.scss
+++ b/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefBoolean.scss
@@ -3,7 +3,8 @@
 
 .survey-form__node-def-boolean {
   display: flex;
-  border: $formBorder;
+  margin-left: 0.2rem;
+  height: 1.2rem;
 }
 
 .survey-form__node-def-entity-table-row {
diff --git a/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefGeo.js b/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefGeo.js
new file mode 100644
index 0000000000..5bc08a3204
--- /dev/null
+++ b/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefGeo.js
@@ -0,0 +1,161 @@
+import './nodeDefGeo.scss'
+
+import classNames from 'classnames'
+import PropTypes from 'prop-types'
+import React, { useCallback, useState } from 'react'
+import { useDispatch, useSelector } from 'react-redux'
+
+import * as Node from '@core/record/node'
+import * as NodeDef from '@core/survey/nodeDef'
+import * as NodeDefLayout from '@core/survey/nodeDefLayout'
+
+import { RecordState } from '@webapp/store/ui/record'
+
+import { Button, ButtonIconDelete, ExpansionPanel, Map, PanelRight } from '@webapp/components'
+import { UploadButton } from '@webapp/components/form'
+import { Input } from '@webapp/components/form/Input'
+import { GeoPolygonInfo } from '@webapp/components/geo/GeoPolygonInfo'
+import { useConfirmAsync } from '@webapp/components/hooks'
+
+import { useSurveyPreferredLang } from '@webapp/store/survey'
+import { NotificationActions } from '@webapp/store/ui'
+import { useAuthCanUseMap } from '@webapp/store/user/hooks'
+
+import { FileUtils } from '@webapp/utils/fileUtils'
+import { GeoJsonUtils } from '@webapp/utils/geoJsonUtils'
+
+import * as NodeDefUiProps from '../../nodeDefUIProps'
+
+const maxFileSize = 1
+
+const NodeDefGeo = (props) => {
+  const {
+    canEditRecord,
+    edit,
+    entry,
+    insideTable = false,
+    nodeDef,
+    nodes,
+    readOnly = false,
+    renderType,
+    updateNode,
+  } = props
+
+  const dispatch = useDispatch()
+  const lang = useSurveyPreferredLang()
+  const canUseMap = useAuthCanUseMap()
+  const noHeader = useSelector(RecordState.hasNoHeader)
+  const canShowMap = canUseMap && !noHeader
+
+  const [showMap, setShowMap] = useState(false)
+  const confirm = useConfirmAsync()
+
+  const entryDisabled = edit || !canEditRecord || readOnly
+
+  const node = entry ? nodes[0] : null
+  const value = Node.getValue(node, NodeDefUiProps.getDefaultValue(nodeDef))
+  const valueText = value ? JSON.stringify(value) : ''
+
+  const nodeDefLabel = NodeDef.getLabel(nodeDef, lang)
+
+  const toggleShowMap = useCallback(() => setShowMap(!showMap), [showMap])
+
+  const onFilesChange = useCallback(
+    async (files) => {
+      const file = files[0]
+      const text = await FileUtils.readAsText(file)
+      const geoJson = GeoJsonUtils.parse(text)
+      if (geoJson) {
+        dispatch(NotificationActions.hideNotification())
+        updateNode(nodeDef, node, geoJson)
+      } else {
+        dispatch(NotificationActions.notifyWarning({ key: 'surveyForm.nodeDefGeo.invalidGeoJsonFileUploaded' }))
+      }
+    },
+    [dispatch, node, nodeDef, updateNode]
+  )
+
+  const onClearValueClick = useCallback(async () => {
+    if (await confirm({ key: 'surveyForm.nodeDefGeo.confirmDelete' })) {
+      updateNode(nodeDef, node, null)
+    }
+  }, [confirm, node, nodeDef, updateNode])
+
+  const mapPanelRight = showMap ? (
+    <PanelRight className="map-panel" width="40vw" onClose={toggleShowMap} header={nodeDefLabel}>
+      <Map editable={!entryDisabled} geoJson={Node.getValue(node)} showOptions={false} />
+    </PanelRight>
+  ) : null
+
+  const mapTriggerButton = canShowMap ? (
+    <Button
+      className="map-trigger-btn btn-transparent"
+      disabled={edit}
+      iconClassName={`icon-map ${insideTable ? 'icon-14px' : 'icon-24px'}`}
+      onClick={toggleShowMap}
+      title="surveyForm.nodeDefCoordinate.showOnMap"
+      variant="text"
+    />
+  ) : null
+
+  if (renderType === NodeDefLayout.renderType.tableBody) {
+    const classNameInTable = classNames(
+      'survey-form__node-def-table-cell-composite',
+      'survey-form__node-def-table-cell-geo',
+      {
+        'with-map': canShowMap,
+      }
+    )
+    return (
+      <div className={classNameInTable}>
+        {mapTriggerButton}
+        {mapPanelRight}
+      </div>
+    )
+  }
+
+  return (
+    <div className={classNames('survey-form__node-def-geo', { 'with-map': canUseMap })}>
+      <div className="info-panel">
+        {!edit && valueText && (
+          <>
+            <ExpansionPanel buttonLabel="common.info" startClosed>
+              <GeoPolygonInfo geoJson={value} />
+            </ExpansionPanel>
+            <ExpansionPanel buttonLabel="surveyForm.nodeDefGeo.geoJSON" startClosed>
+              <Input disabled inputType="textarea" value={valueText} />
+            </ExpansionPanel>
+          </>
+        )}
+      </div>
+      <div className="action-buttons">
+        {valueText && (
+          <>
+            {mapTriggerButton}
+            {mapPanelRight}
+          </>
+        )}
+        {!entryDisabled && (
+          <>
+            <UploadButton className="btn-s" showLabel={false} onChange={onFilesChange} maxSize={maxFileSize} />
+            {valueText && <ButtonIconDelete onClick={onClearValueClick} />}
+          </>
+        )}
+      </div>
+    </div>
+  )
+}
+
+NodeDefGeo.propTypes = {
+  canEditRecord: PropTypes.bool.isRequired,
+  edit: PropTypes.bool.isRequired,
+  entry: PropTypes.bool.isRequired,
+  insideTable: PropTypes.bool,
+  nodeDef: PropTypes.object.isRequired,
+  nodes: PropTypes.array.isRequired,
+  readOnly: PropTypes.bool,
+  renderType: PropTypes.string,
+  updateNode: PropTypes.func.isRequired,
+}
+
+export default NodeDefGeo
diff --git a/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefGeo.scss b/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefGeo.scss
new file mode 100644
index 0000000000..c2f7b39fed
--- /dev/null
+++ b/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefGeo.scss
@@ -0,0 +1,15 @@
+.survey-form__node-def-geo {
+  display: flex;
+  gap: 1rem;
+
+  .info-panel,
+  .action-buttons {
+    display: flex;
+    flex-direction: column;
+    gap: 1rem;
+  }
+
+  .info-panel {
+    flex: 1;
+  }
+}
diff --git a/webapp/components/survey/SurveyForm/nodeDefs/nodeDefUIProps.js b/webapp/components/survey/SurveyForm/nodeDefs/nodeDefUIProps.js
index af9bd5f0d8..d2b5194769 100644
--- a/webapp/components/survey/SurveyForm/nodeDefs/nodeDefUIProps.js
+++ b/webapp/components/survey/SurveyForm/nodeDefs/nodeDefUIProps.js
@@ -16,8 +16,9 @@ import NodeDefBoolean from './components/types/nodeDefBoolean'
 import NodeDefText from './components/types/nodeDefText'
 import NodeDefDate from './components/types/nodeDefDate'
 import NodeDefTime from './components/types/nodeDefTime'
+import NodeDefGeo from './components/types/nodeDefGeo'
 
-const { integer, decimal, text, date, time, boolean, code, coordinate, taxon, file, entity } = NodeDef.nodeDefType
+const { boolean, code, coordinate, date, decimal, entity, file, geo, integer, taxon, text, time } = NodeDef.nodeDefType
 
 const propsUI = {
   [integer]: {
@@ -33,13 +34,7 @@ const propsUI = {
   },
 
   [text]: {
-    icon: (
-      <span className="icon-left display-flex">
-        {R.range(0, 3).map((i) => (
-          <span key={i} className="icon icon-text-color" style={{ margin: '0 -3px' }} />
-        ))}
-      </span>
-    ),
+    icon: <span className="icon-left node_def__icon">ABC</span>,
     defaultValue: '',
   },
 
@@ -85,6 +80,11 @@ const propsUI = {
     ],
   },
 
+  [geo]: {
+    component: NodeDefGeo,
+    icon: <span className="icon icon-codepen icon-left" />,
+  },
+
   [taxon]: {
     component: NodeDefTaxon,
     icon: <span className="icon icon-leaf icon-left" />,
@@ -132,8 +132,9 @@ const getProp = (prop, defaultValue = null) => R.pipe(NodeDef.getType, getPropBy
 
 export const getIconByType = getPropByType('icon')
 
-export const getIconByNodeDef = (nodeDef) => (
+export const getIconByNodeDef = (nodeDef, includeKey = false) => (
   <div className="node-def__icon-wrapper">
+    {includeKey && NodeDef.isKey(nodeDef) && <span className="icon icon-key icon-left" />}
     {NodeDef.isMultipleAttribute(nodeDef) && <span title="Multiple">M</span>}
     {getIconByType(NodeDef.getType(nodeDef))}
   </div>
diff --git a/webapp/model/TreeSelectViewMode.js b/webapp/model/TreeSelectViewMode.js
new file mode 100644
index 0000000000..a5f75ca769
--- /dev/null
+++ b/webapp/model/TreeSelectViewMode.js
@@ -0,0 +1,4 @@
+export const TreeSelectViewMode = {
+  onlyPages: 'onlyPages',
+  allNodeDefs: 'allNodeDefs',
+}
diff --git a/webapp/model/index.js b/webapp/model/index.js
new file mode 100644
index 0000000000..8f94f65ca8
--- /dev/null
+++ b/webapp/model/index.js
@@ -0,0 +1 @@
+export { TreeSelectViewMode } from './TreeSelectViewMode'
diff --git a/webapp/service/api/index.js b/webapp/service/api/index.js
index c34a3f14f4..2f43707b9c 100644
--- a/webapp/service/api/index.js
+++ b/webapp/service/api/index.js
@@ -55,7 +55,7 @@ export {
   updateDataQuerySummary,
   deleteDataQuerySummary,
 } from './dataQuery'
-export { fetchAvailableMapPeriods, fetchAltitude, testMapApiKey, fetchMapWmtsCapabilities } from './map'
+export { fetchAvailableMapPeriods, fetchElevation, testMapApiKey, fetchMapWmtsCapabilities } from './map'
 export {
   fetchSurveyFull,
   fetchSurveys,
diff --git a/webapp/service/api/map/index.js b/webapp/service/api/map/index.js
index 77aceeb5d2..c53a059b89 100644
--- a/webapp/service/api/map/index.js
+++ b/webapp/service/api/map/index.js
@@ -67,9 +67,9 @@ export const fetchAvailableMapPeriods = async ({ provider, periodType }) => {
   return null
 }
 
-export const fetchAltitude = async ({ surveyId, lat, lng }) => {
+export const fetchElevation = async ({ surveyId, lat, lng }) => {
   try {
-    const { data } = await axios.get(`/api/survey/${surveyId}/geo/map/altitude`, { params: { lat, lng } })
+    const { data } = await axios.get(`/api/survey/${surveyId}/geo/map/elevation`, { params: { lat, lng } })
     return data
   } catch {
     return null
diff --git a/webapp/store/survey/nodeDefs/actions.js b/webapp/store/survey/nodeDefs/actions.js
index 48de22908b..eafd2b7e5d 100644
--- a/webapp/store/survey/nodeDefs/actions.js
+++ b/webapp/store/survey/nodeDefs/actions.js
@@ -10,6 +10,7 @@ import * as API from '@webapp/service/api'
 
 import { debounceAction } from '@webapp/utils/reduxUtils'
 
+import { TreeSelectViewMode } from '@webapp/model'
 import { appModuleUri, designerModules } from '@webapp/app/appModules'
 
 import { DialogConfirmActions } from '@webapp/store/ui/dialogConfirm'
@@ -17,6 +18,7 @@ import { NotificationActions } from '@webapp/store/ui/notification'
 
 import * as SurveyState from '../state'
 import { surveyDefsIndexUpdate } from '../actions/actionTypes'
+import { SurveyFormActions, SurveyFormState } from '@webapp/store/ui'
 
 export const nodeDefCreate = 'survey/nodeDef/create'
 export const nodeDefUpdate = 'survey/nodeDef/update'
@@ -29,7 +31,7 @@ export const nodeDefsValidationUpdate = 'survey/nodeDefsValidation/update'
 export const nodeDefsUpdate = 'survey/nodeDefs/update'
 
 // ==== PLAIN ACTIONS
-export const updateNodeDef = ({ nodeDef }) => ({ type: nodeDefUpdate, nodeDef })
+export const updateNodeDef = ({ nodeDef, dirty = false }) => ({ type: nodeDefUpdate, nodeDef, dirty })
 
 export const saveNodeDef = ({ nodeDef, nodeDefParent, surveyCycleKey, nodeDefValidation }) => ({
   type: nodeDefSave,
@@ -51,12 +53,18 @@ export const cancelEdit = ({ nodeDef, nodeDefOriginal }) => ({
 export const createNodeDef = (parent, type, props, navigate) => async (dispatch, getState) => {
   const state = getState()
   const cycle = SurveyState.getSurveyCycleKey(state)
+  const treeSelectViewMode = SurveyFormState.getGlobalStateTreeSelectViewMode(state)
 
   const nodeDef = NodeDef.newNodeDef(parent, type, [cycle], props)
+  const nodeDefUuid = NodeDef.getUuid(nodeDef)
 
   dispatch({ type: nodeDefCreate, nodeDef })
 
-  navigate(`${appModuleUri(designerModules.nodeDef)}${NodeDef.getUuid(nodeDef)}/`)
+  if (treeSelectViewMode === TreeSelectViewMode.onlyPages) {
+    navigate(`${appModuleUri(designerModules.nodeDef)}${nodeDefUuid}/`)
+  } else {
+    dispatch(SurveyFormActions.setFormActiveNodeDefUuid(nodeDefUuid))
+  }
 
   return nodeDef
 }
diff --git a/webapp/store/survey/nodeDefs/reducer.js b/webapp/store/survey/nodeDefs/reducer.js
index 20f0dc58f3..15da855805 100644
--- a/webapp/store/survey/nodeDefs/reducer.js
+++ b/webapp/store/survey/nodeDefs/reducer.js
@@ -25,7 +25,8 @@ const actionHandlers = {
   [NodeDefsActions.nodeDefDelete]: (state, { nodeDef }) => NodeDefsState.dissocNodeDef(nodeDef)(state),
   [NodeDefsActions.nodeDefsDelete]: (state, { nodeDefUuids }) => NodeDefsState.dissocNodeDefs(nodeDefUuids)(state),
 
-  [NodeDefsActions.nodeDefUpdate]: (state, { nodeDef }) => NodeDefsState.assocNodeDef(nodeDef)(state),
+  [NodeDefsActions.nodeDefUpdate]: (state, { nodeDef, dirty = false }) =>
+    NodeDefsState.assocNodeDef(nodeDef, dirty)(state),
 
   [NodeDefsActions.nodeDefSave]: (state, { nodeDef }) => NodeDefsState.assocNodeDef(nodeDef)(state),
 
diff --git a/webapp/store/survey/nodeDefs/state.js b/webapp/store/survey/nodeDefs/state.js
index 1fcaa55da8..b4110b2706 100644
--- a/webapp/store/survey/nodeDefs/state.js
+++ b/webapp/store/survey/nodeDefs/state.js
@@ -6,7 +6,7 @@ export const stateKey = 'nodeDefs'
 
 // ====== UPDATE
 
-export const assocNodeDef = (nodeDef) => R.assoc(NodeDef.getUuid(nodeDef), nodeDef)
+export const assocNodeDef = (nodeDef, dirty = false) => R.assoc(NodeDef.getUuid(nodeDef), { ...nodeDef, dirty })
 
 export const mergeNodeDefs = R.mergeLeft
 
diff --git a/webapp/store/ui/surveyForm/actions.js b/webapp/store/ui/surveyForm/actions.js
index 5a482e88f2..232ad28ae8 100644
--- a/webapp/store/ui/surveyForm/actions.js
+++ b/webapp/store/ui/surveyForm/actions.js
@@ -20,9 +20,20 @@ import * as SurveyFormState from './state'
 export const formReset = 'survey/form/reset'
 export const resetForm = () => (dispatch) => dispatch({ type: formReset })
 
+// Tree select view mode
+export const treeSelectViewModeUpdate = 'survey/form/treeSelect/viewMode/update'
+
+export const setTreeSelectViewMode = (mode) => (dispatch) => dispatch({ type: treeSelectViewModeUpdate, mode })
+
 export const formNodeDefAddChildToUpdate = 'survey/form/nodeDef/addChildTo/update'
 
-// Set current nodeDef unlocked
+// Active nodeDef (if tree select view mode is "allNodes")
+export const formActiveNodeDefUpdate = 'survey/form/activeNodeDef/update'
+
+export const setFormActiveNodeDefUuid = (nodeDefUuid) => (dispatch) =>
+  dispatch({ type: formActiveNodeDefUpdate, nodeDefUuid })
+
+// Node def add-child-to
 export const setFormNodeDefAddChildTo = (nodeDef) => (dispatch) =>
   dispatch({ type: formNodeDefAddChildToUpdate, nodeDef })
 
diff --git a/webapp/store/ui/surveyForm/hooks.js b/webapp/store/ui/surveyForm/hooks.js
index 6bb0a812af..747bad6abe 100644
--- a/webapp/store/ui/surveyForm/hooks.js
+++ b/webapp/store/ui/surveyForm/hooks.js
@@ -1,15 +1,23 @@
 import { useSelector } from 'react-redux'
 
+import { Objects } from '@openforis/arena-core'
+
 import * as Survey from '@core/survey/survey'
 import * as NodeDef from '@core/survey/nodeDef'
 
+import { TreeSelectViewMode } from '@webapp/model'
 import { SurveyState } from '@webapp/store/survey'
 
 import * as SurveyFormState from './state'
-import { Objects } from '@openforis/arena-core'
 
 export const useNodeDefLabelType = () => useSelector(SurveyFormState.getNodeDefLabelType)
 
+export const useTreeSelectViewMode = () => useSelector(SurveyFormState.getGlobalStateTreeSelectViewMode)
+
+export const useIsEditingNodeDefInFullScreen = () => useTreeSelectViewMode() === TreeSelectViewMode.onlyPages
+
+export const useActiveNodeDefUuid = () => useSelector(SurveyFormState.getFormActiveNodeDefUuid)
+
 export const useNodeDefPage = () => useSelector(SurveyFormState.getFormActivePageNodeDef)
 
 export const useShowPageNavigation = () => useSelector(SurveyFormState.showPageNavigation)
diff --git a/webapp/store/ui/surveyForm/index.js b/webapp/store/ui/surveyForm/index.js
index 92e95b2412..5e9973b270 100644
--- a/webapp/store/ui/surveyForm/index.js
+++ b/webapp/store/ui/surveyForm/index.js
@@ -4,9 +4,12 @@ import * as SurveyFormState from './state'
 
 export { SurveyFormActions, SurveyFormReducer, SurveyFormState }
 export {
+  useActiveNodeDefUuid,
+  useIsEditingNodeDefInFullScreen,
   useNodeDefLabelType,
   useNodeDefPage,
   useShowPageNavigation,
   usePagesUuidMap,
   useNotAvailableEntityPageUuids,
+  useTreeSelectViewMode,
 } from './hooks'
diff --git a/webapp/store/ui/surveyForm/reducer.js b/webapp/store/ui/surveyForm/reducer.js
index baa62f5ca2..e5ed24a4b6 100644
--- a/webapp/store/ui/surveyForm/reducer.js
+++ b/webapp/store/ui/surveyForm/reducer.js
@@ -5,6 +5,7 @@ import { exportReducer } from '@webapp/utils/reduxUtils'
 import * as NodeDef from '@core/survey/nodeDef'
 import * as NodeDefLayout from '@core/survey/nodeDefLayout'
 
+import { TreeSelectViewMode } from '@webapp/model'
 import { SystemActions } from '@webapp/store/system'
 import { SurveyActions, NodeDefsActions } from '@webapp/store/survey'
 import * as RecordActions from '../record/actions'
@@ -23,6 +24,12 @@ const actionHandlers = {
   [SurveyFormActions.formReset]: () => ({}),
 
   // Form actions
+  [SurveyFormActions.treeSelectViewModeUpdate]: (state, { mode }) =>
+    SurveyFormState.assocTreeSelectViewMode(mode)(state),
+
+  [SurveyFormActions.formActiveNodeDefUpdate]: (state, { nodeDefUuid }) =>
+    SurveyFormState.assocFormActiveNodeDefUuid(nodeDefUuid)(state),
+
   [SurveyFormActions.formNodeDefAddChildToUpdate]: (state, { nodeDef }) =>
     SurveyFormState.assocNodeDefAddChildTo(nodeDef)(state),
 
@@ -53,7 +60,14 @@ const actionHandlers = {
       const activePageNodeDef = displayInParentPage ? nodeDefParent : nodeDef
       return SurveyFormState.assocFormActivePage(activePageNodeDef)(state)
     }
+    return state
+  },
 
+  [NodeDefsActions.nodeDefPropsUpdateCancel]: (state, { nodeDef, isNodeDefNew }) => {
+    const viewMode = SurveyFormState.getTreeSelectViewMode(state)
+    if (isNodeDefNew && viewMode === TreeSelectViewMode.allNodeDefs) {
+      return SurveyFormState.assocFormActiveNodeDefUuid(NodeDef.getParentUuid(nodeDef))(state)
+    }
     return state
   },
 
diff --git a/webapp/store/ui/surveyForm/state.js b/webapp/store/ui/surveyForm/state.js
index 3426f70870..7467700363 100644
--- a/webapp/store/ui/surveyForm/state.js
+++ b/webapp/store/ui/surveyForm/state.js
@@ -6,6 +6,7 @@ import * as Survey from '@core/survey/survey'
 import * as NodeDef from '@core/survey/nodeDef'
 import * as Record from '@core/record/record'
 
+import { TreeSelectViewMode } from '@webapp/model'
 import { SurveyState } from '@webapp/store/survey'
 import { RecordState } from '@webapp/store/ui/record'
 
@@ -16,6 +17,8 @@ const getState = R.pipe(UiState.getState, R.propOr({}, stateKey))
 const getStateProp = (prop, defaultTo = null) => R.pipe(getState, R.propOr(defaultTo, prop))
 
 const keys = {
+  treeSelectViewMode: 'treeSelectViewMode', // Tree select view mode
+  nodeDefUuid: 'nodeDefUuid', // Current node def (if view mode is "allNodeDefs")
   nodeDefUuidPage: 'nodeDefUuidPage', // Current page nodeDef
   nodeDefUuidAddChildTo: 'nodeDefUuidAddChildTo', // NodeDef (entity) selected to add children to
   nodeDefUuidPageNodeUuid: 'nodeDefUuidPageNodeUuid', // Map of nodeDefUuid -> nodeUuid representing the node loaded in page nodeDefUuid
@@ -24,6 +27,16 @@ const keys = {
   nodeDefLabelType: 'nodeDefLabelType', // NodeDef label function
 }
 
+// context state is global state
+export const getGlobalStateTreeSelectViewMode = getStateProp(keys.treeSelectViewMode, TreeSelectViewMode.onlyPages)
+// context state is SurveyFormState
+export const getTreeSelectViewMode = R.propOr(TreeSelectViewMode.onlyPages, keys.treeSelectViewMode)
+export const assocTreeSelectViewMode = R.assoc(keys.treeSelectViewMode)
+
+export const getFormActiveNodeDefUuid = (state) =>
+  getStateProp(keys.nodeDefUuid, NodeDef.getUuid(getFormActivePageNodeDef(state)))(state)
+export const assocFormActiveNodeDefUuid = R.assoc(keys.nodeDefUuid)
+
 // ====== nodeDefUuidPage
 
 export const assocFormActivePage = (nodeDef) =>
diff --git a/webapp/style/formBase.scss b/webapp/style/formBase.scss
index baefac2414..624a729a45 100644
--- a/webapp/style/formBase.scss
+++ b/webapp/style/formBase.scss
@@ -155,6 +155,11 @@ button:disabled,
   }
 }
 
+.node_def__icon {
+  font-size: small;
+  font-family: monospace;
+}
+
 .MuiTextField-root {
   background-color: $inputBackgroundColor;
 
@@ -184,7 +189,3 @@ button:disabled,
     font-size: 0.8rem;
   }
 }
-
-.full-width {
-  width: 100%;
-}
diff --git a/webapp/utils/fileUtils.js b/webapp/utils/fileUtils.js
index 78b7ef8d69..f7326c2a78 100644
--- a/webapp/utils/fileUtils.js
+++ b/webapp/utils/fileUtils.js
@@ -40,8 +40,26 @@ const acceptByExtension = {
   zip: { 'application/zip': ['.zip'] },
 }
 
+const readAsText = async (file, ignoreErrors = true) =>
+  new Promise((resolve, reject) => {
+    const reader = new FileReader()
+    reader.onload = (e) => {
+      const text = e.target.result
+      resolve(text)
+    }
+    reader.onerror = (error) => {
+      if (ignoreErrors) {
+        resolve(null)
+      } else {
+        reject(error)
+      }
+    }
+    reader.readAsText(file)
+  })
+
 export const FileUtils = {
   getExtension,
   toHumanReadableFileSize,
   acceptByExtension,
+  readAsText,
 }
diff --git a/webapp/utils/geoJsonUtils.js b/webapp/utils/geoJsonUtils.js
new file mode 100644
index 0000000000..4fa73d0631
--- /dev/null
+++ b/webapp/utils/geoJsonUtils.js
@@ -0,0 +1,36 @@
+import area from '@turf/area'
+import centroid from '@turf/centroid'
+import length from '@turf/length'
+
+const countVertices = (geoJson) => {
+  const polygon = geoJson.type === 'Feature' ? geoJson.geometry : geoJson
+  return polygon?.coordinates?.[0]?.length ?? 0
+}
+
+const parse = (geoJsonText) => {
+  let geoJson = null
+  try {
+    geoJson = JSON.parse(geoJsonText)
+  } catch (_error) {
+    // ignore it
+  }
+  return validateFeature(geoJson) ? geoJson : null
+}
+
+const pointFeatureToPoint = (pointFeature) => {
+  if (!pointFeature) return null
+  const [x, y] = pointFeature.geometry?.coordinates ?? []
+  return { x, y }
+}
+
+const validateFeature = (geoJson) => geoJson?.type === 'Feature' && !!geoJson.geometry
+
+export const GeoJsonUtils = {
+  area,
+  centroid,
+  countVertices,
+  parse,
+  perimeter: length,
+  pointFeatureToPoint,
+  validateFeature,
+}
diff --git a/webapp/utils/gsapUtils.js b/webapp/utils/gsapUtils.js
deleted file mode 100644
index fc83c240b1..0000000000
--- a/webapp/utils/gsapUtils.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import * as R from 'ramda'
-
-export const kill = (tl) => () => {
-  if (!R.isNil(tl)) {
-    tl.kill()
-    tl = null
-  }
-}
diff --git a/webapp/utils/testId/index.js b/webapp/utils/testId/index.js
index 28ac4e8fd9..ce65e929c2 100644
--- a/webapp/utils/testId/index.js
+++ b/webapp/utils/testId/index.js
@@ -72,7 +72,6 @@ export const TestId = {
     },
   },
   expressionEditor: {
-    advancedQuery: 'expression-advanced-query',
     applyBtn: 'expression-apply-btn',
     editBtn: (id) => `${id}-edit-btn`,
     literalDropdown: 'expression-literal-dropdown',
diff --git a/webapp/views/App/views/Analysis/Chain/AnalysisNodeDefs/AnalysisNodeDefs.scss b/webapp/views/App/views/Analysis/Chain/AnalysisNodeDefs/AnalysisNodeDefs.scss
index c5d51dbf4b..71f3fea7cc 100644
--- a/webapp/views/App/views/Analysis/Chain/AnalysisNodeDefs/AnalysisNodeDefs.scss
+++ b/webapp/views/App/views/Analysis/Chain/AnalysisNodeDefs/AnalysisNodeDefs.scss
@@ -5,7 +5,7 @@
   grid-template-rows: auto 1fr;
   align-content: start;
 
-  .entity-selector-tree {
+  .nodedef-tree-select {
     border-right: 1px solid $greyBorder;
   }
 
diff --git a/webapp/views/App/views/Analysis/Chain/ChainBasicProps.js b/webapp/views/App/views/Analysis/Chain/ChainBasicProps.js
index 718a8652d1..eaf0d19d37 100644
--- a/webapp/views/App/views/Analysis/Chain/ChainBasicProps.js
+++ b/webapp/views/App/views/Analysis/Chain/ChainBasicProps.js
@@ -1,4 +1,5 @@
 import React, { useEffect, useState } from 'react'
+import PropTypes from 'prop-types'
 
 import * as Survey from '@core/survey/survey'
 import * as RecordStep from '@core/record/recordStep'
@@ -14,7 +15,6 @@ import * as API from '@webapp/service/api'
 
 import { FormItem } from '@webapp/components/form/Input'
 import { Checkbox } from '@webapp/components/form'
-import CyclesSelector from '@webapp/components/survey/CyclesSelector'
 import LabelsEditor from '@webapp/components/survey/LabelsEditor'
 import { ChainRStudioFieldset } from './ChainRStudioFieldset'
 
@@ -60,10 +60,6 @@ export const ChainBasicProps = (props) => {
         labels={chain.props.descriptions}
         onChange={(descriptions) => updateChain({ ...chain, props: { ...chain.props, descriptions } })}
       />
-      <CyclesSelector
-        cyclesKeysSelected={chain.props.cycles}
-        onChange={(cycles) => updateChain({ ...chain, props: { ...chain.props, cycles } })}
-      />
       <FormItem label={i18n.t('chainView.samplingDesign')} className="sampling-design-form-item">
         <Checkbox
           checked={Chain.hasSamplingDesign(chain)}
@@ -92,3 +88,7 @@ export const ChainBasicProps = (props) => {
     </div>
   )
 }
+
+ChainBasicProps.propTypes = {
+  updateChain: PropTypes.func.isRequired,
+}
diff --git a/webapp/views/App/views/Analysis/Chains/Chains.js b/webapp/views/App/views/Analysis/Chains/Chains.js
index 558e44ba46..a1e67e1996 100644
--- a/webapp/views/App/views/Analysis/Chains/Chains.js
+++ b/webapp/views/App/views/Analysis/Chains/Chains.js
@@ -6,7 +6,7 @@ import * as Chain from '@common/analysis/chain'
 
 import * as DateUtils from '@core/dateUtils'
 
-import { useSurveyCycleKey, useSurveyPreferredLang } from '@webapp/store/survey'
+import { useSurveyPreferredLang } from '@webapp/store/survey'
 
 import Table from '@webapp/components/Table'
 import ErrorBadge from '@webapp/components/errorBadge'
@@ -17,7 +17,6 @@ import HeaderLeft from './HeaderLeft'
 
 const ChainsView = () => {
   const navigate = useNavigate()
-  const surveyCycleKey = useSurveyCycleKey()
   const lang = useSurveyPreferredLang()
 
   const onRowClick = (chain) => navigate(`${appModuleUri(analysisModules.chain)}${Chain.getUuid(chain)}`)
@@ -28,7 +27,6 @@ const ChainsView = () => {
       headerLeftComponent={HeaderLeft}
       module="processing-chains"
       onRowClick={onRowClick}
-      restParams={{ surveyCycleKey }}
       columns={[
         {
           key: 'validation',
diff --git a/webapp/views/App/views/Data/DataImport/DataImport.scss b/webapp/views/App/views/Data/DataImport/DataImport.scss
index 484c5f6e7f..66624d8210 100644
--- a/webapp/views/App/views/Data/DataImport/DataImport.scss
+++ b/webapp/views/App/views/Data/DataImport/DataImport.scss
@@ -21,7 +21,7 @@
       grid-template-columns: 0.3fr 0.7fr;
     }
 
-    .entity-selector-tree {
+    .nodedef-tree-select {
       max-height: 50vh;
     }
   }
diff --git a/webapp/views/App/views/Data/DataImport/DataImportCsvView.js b/webapp/views/App/views/Data/DataImport/DataImportCsvView.js
index e6bbea6b2b..8c1169fc16 100644
--- a/webapp/views/App/views/Data/DataImport/DataImportCsvView.js
+++ b/webapp/views/App/views/Data/DataImport/DataImportCsvView.js
@@ -23,7 +23,7 @@ import { ButtonDownload, ButtonIconInfo, Dropzone, ExpansionPanel, Stepper } fro
 import { ButtonGroup, Checkbox } from '@webapp/components/form'
 import { FormItem } from '@webapp/components/form/Input'
 import CycleSelector from '@webapp/components/survey/CycleSelector'
-import { EntitySelectorTree } from '@webapp/components/survey/NodeDefsSelector'
+import { NodeDefTreeSelect } from '@webapp/components/survey/NodeDefsSelector'
 import NodeDefLabelSwitch from '@webapp/components/survey/NodeDefLabelSwitch'
 
 import { DataImportCompleteDialog } from './DataImportCompleteDialog'
@@ -201,10 +201,10 @@ export const DataImportCsvView = () => {
           {dataImportType && (
             <FormItem className="entity-form-item" label={i18n.t('dataImportView.importIntoMultipleEntityOrAttribute')}>
               <>
-                <EntitySelectorTree
+                <NodeDefTreeSelect
                   nodeDefLabelType={nodeDefLabelType}
                   nodeDefUuidActive={selectedNodeDefUuid}
-                  onlyEntities={false}
+                  includeMultipleAttributes
                   onSelect={onNodeDefSelect}
                   isDisabled={() => dataImportType === importTypes.insertNewRecords}
                 />
diff --git a/webapp/views/App/views/Data/DataImport/DataImportCsvView.scss b/webapp/views/App/views/Data/DataImport/DataImportCsvView.scss
index 7242554b98..d827f6bba5 100644
--- a/webapp/views/App/views/Data/DataImport/DataImportCsvView.scss
+++ b/webapp/views/App/views/Data/DataImport/DataImportCsvView.scss
@@ -29,7 +29,7 @@
       grid-row-gap: 1rem;
     }
 
-    .entity-selector-tree {
+    .nodedef-tree-select {
       background-color: $white;
     }
 
diff --git a/webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/convertDataToPoints.js b/webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/convertDataToPoints.js
deleted file mode 100644
index 9031383b86..0000000000
--- a/webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/convertDataToPoints.js
+++ /dev/null
@@ -1,75 +0,0 @@
-import { latLngBounds } from 'leaflet'
-
-import { Points } from '@openforis/arena-core'
-
-import * as Survey from '@core/survey/survey'
-
-import { ColumnNodeDef, TableDataNodeDef } from '@common/model/db'
-
-import { ValueFormatter } from '@webapp/components/DataQuery'
-
-export const convertDataToPoints = ({ data, attributeDef, nodeDefParent, survey, i18n }) => {
-  const surveyInfo = Survey.getSurveyInfo(survey)
-  const srsIndex = Survey.getSRSIndex(surveyInfo)
-
-  const dataTable = new TableDataNodeDef(survey, nodeDefParent)
-  const attributeColumn = new ColumnNodeDef(dataTable, attributeDef)
-  const parentEntityColumn = new ColumnNodeDef(dataTable, nodeDefParent)
-
-  const ancestorsKeyAttributes = Survey.getNodeDefAncestorsKeyAttributes(attributeDef)(survey)
-  const ancestorsKeysColumns = ancestorsKeyAttributes.map(
-    (ancestorKeyAttribute) => new ColumnNodeDef(dataTable, ancestorKeyAttribute)
-  )
-
-  return data.reduce(
-    (acc, item, index) => {
-      const location = item[attributeColumn.name]
-      if (!location) {
-        acc.pointIndexByDataIndex[index] = null
-        return acc
-      }
-
-      // workaraound: prepend SRID= to location if not specified
-      const locationStr = location.startsWith('SRID=') ? location : `SRID=${location}`
-      const point = Points.parse(locationStr)
-      const pointLatLong = point ? Points.toLatLong(point, srsIndex) : null
-      if (!pointLatLong) {
-        // location is not valid, cannot convert it to lat-lon
-        acc.pointIndexByDataIndex[index] = null
-        return acc
-      }
-
-      const { x: long, y: lat } = pointLatLong
-
-      acc.bounds.extend([lat, long])
-
-      const recordUuid = item[TableDataNodeDef.columnSet.recordUuid]
-      const recordOwnerUuid = item[TableDataNodeDef.columnSet.recordOwnerUuid]
-      const parentUuid = item[parentEntityColumn.name]
-      const key = `${recordUuid}-${parentUuid}`
-      const ancestorsKeys = ancestorsKeysColumns.map((column) => {
-        const ancestorDef = column.nodeDef
-        const rawValue = item[column.name]
-        const label = item[`${column.name}_label`]
-        return ValueFormatter.format({ value: rawValue, label, i18n, nodeDef: ancestorDef })
-      })
-
-      acc.points.push({
-        type: 'Feature',
-        properties: { key, cluster: false, point, recordUuid, recordOwnerUuid, parentUuid, location, ancestorsKeys },
-        geometry: {
-          type: 'Point',
-          coordinates: [long, lat],
-        },
-      })
-      acc.pointIndexByDataIndex[index] = index
-
-      return acc
-    },
-    {
-      points: [],
-      pointIndexByDataIndex: [], // data item converted into a point can be "null", keep track of it
-      bounds: latLngBounds(), // keep track of the layer bounds to calculate its center and pan the map into it
-    }
-  )
-}
diff --git a/webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/index.js b/webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/index.js
deleted file mode 100644
index 2852c7e8d7..0000000000
--- a/webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { CoordinateAttributeDataLayer } from './CoordinateAttributeDataLayer'
diff --git a/webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/CoordinateAttributeMarker.js b/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/CoordinateAttributeMarker.js
similarity index 53%
rename from webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/CoordinateAttributeMarker.js
rename to webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/CoordinateAttributeMarker.js
index 194a10cc89..887e72d45f 100644
--- a/webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/CoordinateAttributeMarker.js
+++ b/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/CoordinateAttributeMarker.js
@@ -1,59 +1,46 @@
-import React, { useCallback } from 'react'
-import { CircleMarker } from 'react-leaflet'
+import React, { useCallback, useMemo } from 'react'
+import { CircleMarker, GeoJSON } from 'react-leaflet'
 import PropTypes from 'prop-types'
 
 import * as Survey from '@core/survey/survey'
+import * as ObjectUtils from '@core/objectUtils'
+
+import { useSurveyInfo } from '@webapp/store/survey'
 
 import { MarkerTooltip, useLayerMarker } from '../common'
 import { CoordinateAttributePopUp } from './CoordinateAttributePopUp'
 import { CoordinateAttributePolygon } from './CoordinateAttributePolygon'
 
-import { useSurveyInfo } from '@webapp/store/survey'
-
 const markerRadius = 10
 const fillOpacity = 0.5
 
 export const CoordinateAttributeMarker = (props) => {
   const {
     attributeDef,
-    markersColor,
-    onRecordEditClick,
-    pointFeature,
+    data,
     flyToPoint,
     flyToNextPoint,
     flyToPreviousPoint,
+    markersColor,
     onPopupClose,
+    onRecordEditClick,
     popupOpen,
     setMarkerByKey,
   } = props
 
-  const { ancestorsKeys, key } = pointFeature.properties
-  const [longitude, latitude] = pointFeature.geometry.coordinates
+  const { ancestorsKeys, data: innerData, key } = data.properties
+  const [longitude, latitude] = data.geometry.coordinates
 
   const surveyInfo = useSurveyInfo()
   const { markerRef, showMarkersLabels } = useLayerMarker({ key, popupOpen, setMarkerByKey })
 
   const onDoubleClick = useCallback(() => {
-    flyToPoint(pointFeature)
-  }, [flyToPoint, pointFeature])
+    flyToPoint(data)
+  }, [flyToPoint, data])
 
-  return (
-    <div>
-      {Survey.isSampleBasedImageInterpretationEnabled(surveyInfo) && (
-        <CoordinateAttributePolygon latitude={latitude} longitude={longitude} />
-      )}
-      <CircleMarker
-        ref={(ref) => {
-          markerRef.current = ref
-          setMarkerByKey({ key, marker: ref })
-        }}
-        center={[latitude, longitude]}
-        radius={markerRadius}
-        color={markersColor}
-        fillColor={markersColor}
-        fillOpacity={fillOpacity}
-        eventHandlers={{ dblclick: onDoubleClick, popupclose: onPopupClose }}
-      >
+  const content = useMemo(
+    () => (
+      <>
         {showMarkersLabels && <MarkerTooltip color={markersColor}>{ancestorsKeys.join(' - ')}</MarkerTooltip>}
 
         <CoordinateAttributePopUp
@@ -61,22 +48,72 @@ export const CoordinateAttributeMarker = (props) => {
           flyToNextPoint={flyToNextPoint}
           flyToPreviousPoint={flyToPreviousPoint}
           onRecordEditClick={onRecordEditClick}
-          pointFeature={pointFeature}
+          pointFeature={data}
         />
-      </CircleMarker>
+      </>
+    ),
+    [
+      ancestorsKeys,
+      attributeDef,
+      data,
+      flyToNextPoint,
+      flyToPreviousPoint,
+      markersColor,
+      onRecordEditClick,
+      showMarkersLabels,
+    ]
+  )
+
+  const setRef = useCallback(
+    (ref) => {
+      markerRef.current = ref
+      setMarkerByKey({ key, marker: ref })
+    },
+    [key, markerRef, setMarkerByKey]
+  )
+
+  const eventHandlers = useMemo(
+    () => ObjectUtils.keepNonEmptyProps({ dblclick: onDoubleClick, popupclose: onPopupClose }),
+    [onDoubleClick, onPopupClose]
+  )
+
+  return (
+    <div>
+      {Survey.isSampleBasedImageInterpretationEnabled(surveyInfo) && (
+        <CoordinateAttributePolygon latitude={latitude} longitude={longitude} />
+      )}
+      {!innerData && (
+        <CircleMarker
+          center={[latitude, longitude]}
+          color={markersColor}
+          eventHandlers={eventHandlers}
+          fillColor={markersColor}
+          fillOpacity={fillOpacity}
+          radius={markerRadius}
+          ref={setRef}
+        >
+          {content}
+        </CircleMarker>
+      )}
+
+      {innerData && (
+        <GeoJSON data={innerData} eventHandlers={eventHandlers} color={markersColor} ref={setRef}>
+          {content}
+        </GeoJSON>
+      )}
     </div>
   )
 }
 
 CoordinateAttributeMarker.propTypes = {
   attributeDef: PropTypes.any,
-  markersColor: PropTypes.any,
-  onRecordEditClick: PropTypes.any,
-  pointFeature: PropTypes.any,
+  data: PropTypes.any,
   flyToPoint: PropTypes.func,
   flyToNextPoint: PropTypes.func,
   flyToPreviousPoint: PropTypes.func,
+  markersColor: PropTypes.any,
   onPopupClose: PropTypes.func,
+  onRecordEditClick: PropTypes.any,
   popupOpen: PropTypes.bool,
   setMarkerByKey: PropTypes.func,
 }
diff --git a/webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/CoordinateAttributePolygon.js b/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/CoordinateAttributePolygon.js
similarity index 100%
rename from webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/CoordinateAttributePolygon.js
rename to webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/CoordinateAttributePolygon.js
diff --git a/webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/CoordinateAttributePopUp.js b/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/CoordinateAttributePopUp.js
similarity index 93%
rename from webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/CoordinateAttributePopUp.js
rename to webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/CoordinateAttributePopUp.js
index fcc3fbd770..db75dced0b 100644
--- a/webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/CoordinateAttributePopUp.js
+++ b/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/CoordinateAttributePopUp.js
@@ -22,7 +22,7 @@ import { useSurvey, useSurveyPreferredLang, useSurveyInfo } from '@webapp/store/
 import { useUserName } from '@webapp/store/user/hooks'
 import { useI18n } from '@webapp/store/system'
 
-import { useAltitude } from '../common/useAltitude'
+import { useElevation } from '../common/useElevation'
 import { WhispMenuButton } from './WhispMenuButton'
 
 const getEarthMapUrl = (geojson) => `https://earthmap.org/?aoi=global&polygon=${JSON.stringify(geojson)}`
@@ -52,7 +52,7 @@ const buildPath = ({ survey, attributeDef, ancestorsKeys, lang }) => {
   return pathParts.join(' -> ')
 }
 
-const generateContent = ({ i18n, recordOwnerName, point, path, altitude }) => {
+const generateContent = ({ i18n, recordOwnerName, point, path, elevation }) => {
   const coordinateNumericFieldPrecision = point.srs === DEFAULT_SRS.code ? 6 : NaN
   const xFormatted = NumberUtils.roundToPrecision(point.x, coordinateNumericFieldPrecision)
   const yFormatted = NumberUtils.roundToPrecision(point.y, coordinateNumericFieldPrecision)
@@ -61,7 +61,7 @@ const generateContent = ({ i18n, recordOwnerName, point, path, altitude }) => {
 * **X**: ${xFormatted}
 * **Y**: ${yFormatted}
 * **SRS**: ${point.srs}
-* **${i18n.t('mapView.altitude')}**: ${altitude}
+* **${i18n.t('mapView.elevation')}**: ${elevation}
 * **${i18n.t('common.owner')}**: ${recordOwnerName ?? '...'}`
   return content
 }
@@ -82,8 +82,8 @@ export const CoordinateAttributePopUp = (props) => {
   const [open, setOpen] = useState(false)
 
   const pointLatLong = PointFactory.createInstance({ x: longitude, y: latitude })
-  // fetch altitude and record owner name only when popup is open
-  const altitude = useAltitude({ survey, point: pointLatLong, active: open })
+  // fetch elevation and record owner name only when popup is open
+  const elevation = useElevation({ survey, point: pointLatLong, active: open })
   const recordOwnerName = useUserName({ userUuid: recordOwnerUuid, active: open })
 
   const onRemove = useCallback(() => {
@@ -135,8 +135,8 @@ export const CoordinateAttributePopUp = (props) => {
   }, [generateGeoJsonWithName])
 
   const content = useMemo(
-    () => generateContent({ i18n, recordOwnerName, point, path, altitude }),
-    [altitude, i18n, path, point, recordOwnerName]
+    () => generateContent({ i18n, recordOwnerName, point, path, elevation }),
+    [elevation, i18n, path, point, recordOwnerName]
   )
 
   return (
@@ -151,7 +151,7 @@ export const CoordinateAttributePopUp = (props) => {
         <Markdown source={content} />
 
         <div className="button-bar">
-          <div role="row">
+          <div className="row">
             <ButtonPrevious className="prev-btn" onClick={onClickPrevious} showLabel={false} />
 
             <ButtonIconEdit
@@ -163,7 +163,7 @@ export const CoordinateAttributePopUp = (props) => {
 
             <ButtonNext className="next-btn" onClick={onClickNext} showLabel={false} />
           </div>
-          <div role="row">
+          <div className="row">
             <Button
               className="earth-map-btn"
               iconAlt="Earth Map"
diff --git a/webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/CoordinateAttributePopUp.scss b/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/CoordinateAttributePopUp.scss
similarity index 89%
rename from webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/CoordinateAttributePopUp.scss
rename to webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/CoordinateAttributePopUp.scss
index a9f965a2da..630338c536 100644
--- a/webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/CoordinateAttributePopUp.scss
+++ b/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/CoordinateAttributePopUp.scss
@@ -9,14 +9,14 @@
     gap: 0.5rem;
     margin-top: 12px;
 
-    div[role='row'] {
+    .row {
       display: flex;
       flex-direction: row;
     }
 
     button {
       margin: 0 0.4rem;
-      padding: 0.6rem 0.6rem;
+      padding: 0.4rem 0.6rem;
       white-space: nowrap;
     }
 
diff --git a/webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/CoordinateAttributeDataLayer.js b/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/GeoAttributeDataLayer.js
similarity index 86%
rename from webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/CoordinateAttributeDataLayer.js
rename to webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/GeoAttributeDataLayer.js
index 7c0b4a1f92..6977583827 100644
--- a/webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/CoordinateAttributeDataLayer.js
+++ b/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/GeoAttributeDataLayer.js
@@ -2,11 +2,12 @@ import React from 'react'
 import { LayerGroup, LayersControl } from 'react-leaflet'
 import PropTypes from 'prop-types'
 
+import * as NodeDef from '@core/survey/nodeDef'
 import { ClusterMarker, useFlyToPoint } from '../common'
 import { CoordinateAttributeMarker } from './CoordinateAttributeMarker'
-import { useCoordinateAttributeDataLayer } from './useCoordinateAttributeDataLayer'
+import { useGeoAttributeDataLayer } from './useGeoAttributeDataLayer'
 
-export const CoordinateAttributeDataLayer = (props) => {
+export const GeoAttributeDataLayer = (props) => {
   const { attributeDef, markersColor, onRecordEditClick } = props
 
   const {
@@ -17,7 +18,7 @@ export const CoordinateAttributeDataLayer = (props) => {
     getClusterLeaves,
     totalPoints,
     points,
-  } = useCoordinateAttributeDataLayer(props)
+  } = useGeoAttributeDataLayer(props)
 
   const {
     currentPointShown,
@@ -28,7 +29,7 @@ export const CoordinateAttributeDataLayer = (props) => {
     onCurrentPointPopupClose,
     openPopupOfPoint,
     setMarkerByKey,
-  } = useFlyToPoint({ points, onRecordEditClick })
+  } = useFlyToPoint({ points, onRecordEditClick, zoomToMaxLevel: NodeDef.isCoordinate(attributeDef) })
 
   return (
     <LayersControl.Overlay name={layerName}>
@@ -60,12 +61,12 @@ export const CoordinateAttributeDataLayer = (props) => {
             <CoordinateAttributeMarker
               key={key}
               attributeDef={attributeDef}
+              data={cluster}
               flyToPoint={flyToPoint}
               flyToNextPoint={flyToNextPoint}
               flyToPreviousPoint={flyToPreviousPoint}
               markersColor={markersColor}
               onRecordEditClick={onRecordEditClick}
-              pointFeature={cluster}
               setMarkerByKey={setMarkerByKey}
             />
           )
@@ -73,12 +74,12 @@ export const CoordinateAttributeDataLayer = (props) => {
         {currentPointShown && (
           <CoordinateAttributeMarker
             attributeDef={attributeDef}
+            data={currentPointShown}
             flyToNextPoint={flyToNextPoint}
             flyToPreviousPoint={flyToPreviousPoint}
             markersColor={markersColor}
             onPopupClose={onCurrentPointPopupClose}
             onRecordEditClick={onRecordEditClick}
-            pointFeature={currentPointShown}
             popupOpen={currentPointPopupOpen}
             setMarkerByKey={setMarkerByKey}
           />
@@ -88,7 +89,7 @@ export const CoordinateAttributeDataLayer = (props) => {
   )
 }
 
-CoordinateAttributeDataLayer.propTypes = {
+GeoAttributeDataLayer.propTypes = {
   attributeDef: PropTypes.any,
   markersColor: PropTypes.any,
   onRecordEditClick: PropTypes.func,
diff --git a/webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/WhispMenuButton.js b/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/WhispMenuButton.js
similarity index 100%
rename from webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/WhispMenuButton.js
rename to webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/WhispMenuButton.js
diff --git a/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/convertDataToGeoJsonPoints.js b/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/convertDataToGeoJsonPoints.js
new file mode 100644
index 0000000000..6c9b8085b1
--- /dev/null
+++ b/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/convertDataToGeoJsonPoints.js
@@ -0,0 +1,107 @@
+import { latLngBounds } from 'leaflet'
+
+import { PointFactory, Points } from '@openforis/arena-core'
+
+import { ColumnNodeDef, TableDataNodeDef } from '@common/model/db'
+import * as Survey from '@core/survey/survey'
+import * as NodeDef from '@core/survey/nodeDef'
+import * as StringUtils from '@core/stringUtils'
+
+import { ValueFormatter } from '@webapp/components/DataQuery'
+import { GeoJsonUtils } from '@webapp/utils/geoJsonUtils'
+
+const extractCommonProperties = ({ dataItem, parentEntityColumn, ancestorsKeysColumns, i18n }) => {
+  const recordUuid = dataItem[TableDataNodeDef.columnSet.recordUuid]
+  const recordOwnerUuid = dataItem[TableDataNodeDef.columnSet.recordOwnerUuid]
+  const parentUuid = dataItem[parentEntityColumn.name]
+  const key = `${recordUuid}-${parentUuid}`
+  const ancestorsKeys = ancestorsKeysColumns.map((column) => {
+    const ancestorDef = column.nodeDef
+    const rawValue = dataItem[column.name]
+    const label = dataItem[`${column.name}_label`]
+    return ValueFormatter.format({ value: rawValue, label, i18n, nodeDef: ancestorDef })
+  })
+
+  return {
+    key,
+    ancestorsKeys,
+    parentUuid,
+    recordUuid,
+    recordOwnerUuid,
+    center: true,
+  }
+}
+
+const pointExtractorByNodeDefType = {
+  [NodeDef.nodeDefType.coordinate]: ({ attributeValue, srsIndex }) => {
+    const locationStr = StringUtils.prependIfMissing('SRID=')(attributeValue)
+    const point = Points.parse(locationStr)
+    const pointLatLong = point ? Points.toLatLong(point, srsIndex) : null
+    return { point: pointLatLong }
+  },
+  [NodeDef.nodeDefType.geo]: ({ attributeValue }) => {
+    const geoJson = JSON.parse(attributeValue)
+
+    const centroidFeaturePoint = GeoJsonUtils.centroid(geoJson.geometry)
+    const point = GeoJsonUtils.pointFeatureToPoint(centroidFeaturePoint)
+    return { point, properties: { data: geoJson } }
+  },
+}
+
+const extractPointAndExtraPropertiesFromAttributeValue = ({ attributeDef, attributeValue, srsIndex }) =>
+  pointExtractorByNodeDefType[NodeDef.getType(attributeDef)]({ attributeDef, attributeValue, srsIndex })
+
+export const convertDataToGeoJsonPoints = ({ data, attributeDef, nodeDefParent, survey, i18n }) => {
+  const surveyInfo = Survey.getSurveyInfo(survey)
+  const srsIndex = Survey.getSRSIndex(surveyInfo)
+
+  const dataTable = new TableDataNodeDef(survey, nodeDefParent)
+  const attributeColumn = new ColumnNodeDef(dataTable, attributeDef)
+  const parentEntityColumn = new ColumnNodeDef(dataTable, nodeDefParent)
+
+  const ancestorsKeyAttributes = Survey.getNodeDefAncestorsKeyAttributes(attributeDef)(survey)
+  const ancestorsKeysColumns = ancestorsKeyAttributes.map(
+    (ancestorKeyAttribute) => new ColumnNodeDef(dataTable, ancestorKeyAttribute)
+  )
+
+  return data.reduce(
+    (acc, dataItem, index) => {
+      const attributeValue = dataItem[attributeColumn.name]
+      if (!attributeValue) return acc
+
+      const { point, properties: extraProperties = {} } = extractPointAndExtraPropertiesFromAttributeValue({
+        attributeDef,
+        attributeValue,
+        srsIndex,
+      })
+
+      if (!point) return acc
+
+      const properties = {
+        ...extractCommonProperties({ dataItem, parentEntityColumn, ancestorsKeysColumns, i18n }),
+        point: PointFactory.createInstance({ x: point.x, y: point.y }),
+        ...extraProperties,
+      }
+
+      const pointFeature = {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [point.x, point.y],
+        },
+        properties,
+      }
+
+      acc.bounds.extend([point.x, point.y])
+      acc.points.push(pointFeature)
+      acc.pointIndexByDataIndex[index] = acc.points.length - 1
+
+      return acc
+    },
+    {
+      bounds: latLngBounds(), // keep track of the layer bounds to calculate its center and pan the map into it
+      points: [],
+      pointIndexByDataIndex: [], // data item converted into geojson item can be "null", keep track of it
+    }
+  )
+}
diff --git a/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/index.js b/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/index.js
new file mode 100644
index 0000000000..eb706c6432
--- /dev/null
+++ b/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/index.js
@@ -0,0 +1 @@
+export { GeoAttributeDataLayer } from './GeoAttributeDataLayer'
diff --git a/webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/useCoordinateAttributeDataLayer.js b/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/useGeoAttributeDataLayer.js
similarity index 68%
rename from webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/useCoordinateAttributeDataLayer.js
rename to webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/useGeoAttributeDataLayer.js
index 5364d4262f..0e7631a1f0 100644
--- a/webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/useCoordinateAttributeDataLayer.js
+++ b/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/useGeoAttributeDataLayer.js
@@ -1,33 +1,30 @@
-import { useCallback, useEffect, useMemo, useState } from 'react'
+import { useEffect, useMemo, useState } from 'react'
 import { useMap } from 'react-leaflet'
 
 import { Objects } from '@openforis/arena-core'
 
 import { Query } from '@common/model/query'
-import { WebSocketEvents } from '@common/webSocket/webSocketEvents'
 
 import * as Survey from '@core/survey/survey'
 import * as NodeDef from '@core/survey/nodeDef'
-import * as Node from '@core/record/node'
 
 import { useDataQuery } from '@webapp/components/DataQuery/store'
 import { useSurvey, useSurveyPreferredLang } from '@webapp/store/survey'
 import { useI18n } from '@webapp/store/system'
-import { useOnWebSocketEvent } from '@webapp/components/hooks'
 
 import { useMapClusters, useMapLayerAdd } from '../common'
+import { convertDataToGeoJsonPoints } from './convertDataToGeoJsonPoints'
 import { useOnEditedRecordDataFetched } from './useOnEditedRecordDataFetched'
-import { convertDataToPoints } from './convertDataToPoints'
 
-export const useCoordinateAttributeDataLayer = (props) => {
+export const useGeoAttributeDataLayer = (props) => {
   const { attributeDef, markersColor, editingRecordUuid } = props
 
   const [state, setState] = useState({
     query: Query.create(),
     data: null,
+    editedRecordQuery: Query.create(),
     points: [],
     pointIndexByDataIndex: [],
-    editedRecordQuery: Query.create(),
   })
   const i18n = useI18n()
   const lang = useSurveyPreferredLang()
@@ -43,7 +40,7 @@ export const useCoordinateAttributeDataLayer = (props) => {
     [attributeDef, survey]
   )
 
-  const { query, points, editedRecordQuery } = state
+  const { editedRecordQuery, points, query } = state
 
   const layerInnerName = useMemo(
     () =>
@@ -79,7 +76,7 @@ export const useCoordinateAttributeDataLayer = (props) => {
   // exclude data with null coordinate values
   const dataFetched = useMemo(
     () => dataFetchedTemp?.filter((item) => !Objects.isEmpty(item[NodeDef.getName(attributeDef)])),
-    [dataFetchedTemp]
+    [attributeDef, dataFetchedTemp]
   )
 
   // when data has been loaded, convert fetched items to GEOJson points
@@ -87,49 +84,29 @@ export const useCoordinateAttributeDataLayer = (props) => {
     if (!dataFetched) return
 
     const {
-      points: _points,
-      pointIndexByDataIndex: _pointIndexByDataIndex,
       bounds,
-    } = convertDataToPoints({ data: dataFetched, attributeDef, nodeDefParent, survey, i18n })
+      pointIndexByDataIndex: _pointIndexByDataIndex,
+      points: _points,
+    } = convertDataToGeoJsonPoints({
+      data: dataFetched,
+      attributeDef,
+      nodeDefParent,
+      survey,
+      i18n,
+    })
 
     setState((statePrev) => ({
       ...statePrev,
       data: dataFetched,
-      points: _points,
       pointIndexByDataIndex: _pointIndexByDataIndex,
+      points: _points,
     }))
 
     if (_points.length > 0 && map.getZoom() < 5) {
       // pan map into layer bounds center
       map.panTo(bounds.getCenter())
     }
-  }, [dataFetched])
-
-  // listen to websocket nodesUpdate events to detect edited record updates
-  useOnWebSocketEvent({
-    eventName: WebSocketEvents.nodesUpdate,
-    eventHandler: useCallback(
-      ({ updatedNodes }) => {
-        if (editingRecordUuid) {
-          const rootKeyDefs = Survey.getNodeDefRootKeys(survey)
-          const rootKeyDefsUuids = rootKeyDefs.map(NodeDef.getUuid)
-          const shouldFetchRecordData = Object.values(updatedNodes).some(
-            (nodeUpdated) =>
-              Node.getRecordUuid(nodeUpdated) === editingRecordUuid &&
-              (Node.getNodeDefUuid(nodeUpdated) === NodeDef.getUuid(attributeDef) ||
-                rootKeyDefsUuids.includes(Node.getNodeDefUuid(nodeUpdated)))
-          )
-          if (shouldFetchRecordData) {
-            setState((statePrev) => ({
-              ...statePrev,
-              editedRecordQuery: Query.assocFilterRecordUuid(editingRecordUuid)(statePrev.query),
-            }))
-          }
-        }
-      },
-      [setState, editingRecordUuid, query]
-    ),
-  })
+  }, [attributeDef, dataFetched, i18n, map, nodeDefParent, survey])
 
   // fetch record data on edited record query updates
   const { data: dataEditedRecord } = useDataQuery({ query: editedRecordQuery })
diff --git a/webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/useOnEditedRecordDataFetched.js b/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/useOnEditedRecordDataFetched.js
similarity index 90%
rename from webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/useOnEditedRecordDataFetched.js
rename to webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/useOnEditedRecordDataFetched.js
index d0c5e24e68..6ebdfcf525 100644
--- a/webapp/views/App/views/Data/MapView/CoordinateAttributeDataLayer/useOnEditedRecordDataFetched.js
+++ b/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/useOnEditedRecordDataFetched.js
@@ -1,11 +1,13 @@
 import { useEffect } from 'react'
 
+import { Objects } from '@openforis/arena-core'
+
 import { ColumnNodeDef, TableDataNodeDef } from '@common/model/db'
 import { Query } from '@common/model/query'
 
 import { useI18n } from '@webapp/store/system'
 
-import { convertDataToPoints } from './convertDataToPoints'
+import { convertDataToGeoJsonPoints } from './convertDataToGeoJsonPoints'
 
 const _updateDataAndPoints = ({
   editedRecordItem,
@@ -28,7 +30,7 @@ const _updateDataAndPoints = ({
   )
   if (oldDataItemIndex >= 0) {
     dataUpdated[oldDataItemIndex] = editedRecordItem
-    const { points: pointsConverted } = convertDataToPoints({
+    const { points: pointsConverted } = convertDataToGeoJsonPoints({
       data: [editedRecordItem],
       attributeDef,
       nodeDefParent,
@@ -38,7 +40,7 @@ const _updateDataAndPoints = ({
     const pointConverted = pointsConverted.length > 0 ? pointsConverted[0] : null
     if (pointConverted) {
       const pointIndex = pointIndexByDataIndex[oldDataItemIndex]
-      if (pointIndex !== null) {
+      if (Objects.isNotEmpty(pointIndex)) {
         pointsUpdated[pointIndex] = pointConverted
       }
     }
diff --git a/webapp/views/App/views/Data/MapView/MapView.js b/webapp/views/App/views/Data/MapView/MapView.js
index 3498e875f0..02d9f60fd7 100644
--- a/webapp/views/App/views/Data/MapView/MapView.js
+++ b/webapp/views/App/views/Data/MapView/MapView.js
@@ -1,6 +1,6 @@
 import './MapView.scss'
 
-import React, { useCallback, useState } from 'react'
+import React, { useCallback, useMemo, useState } from 'react'
 
 import * as Survey from '@core/survey/survey'
 import * as NodeDef from '@core/survey/nodeDef'
@@ -12,11 +12,10 @@ import { useSurvey } from '@webapp/store/survey'
 
 import { useRandomColors } from '@webapp/components/hooks/useRandomColors'
 import { Map } from '@webapp/components/Map'
-import SurveyDefsLoader from '@webapp/components/survey/SurveyDefsLoader'
 
 import { SamplingPointDataLayer } from './SamplingPointDataLayer'
-import { CoordinateAttributeDataLayer } from './CoordinateAttributeDataLayer'
 import { RecordEditModal } from '../common/RecordEditModal'
+import { GeoAttributeDataLayer } from './GeoAttributeDataLayer'
 
 const getSamplingPointDataLevels = (survey) => {
   const samplingPointDataCategory = Survey.getSamplingPointDataCategory(survey)
@@ -37,10 +36,13 @@ const MapWrapper = () => {
   })
   const { editingRecordUuid, editingParentNodeUuid, lastRecordEditModalState } = state
 
-  const coordinateAttributeDefs = Survey.getNodeDefsArray(survey).filter(NodeDef.isCoordinate)
-  const samplingPointDataLevels = getSamplingPointDataLevels(survey)
+  const geoAttributeDefs = useMemo(
+    () => Survey.getNodeDefsArray(survey).filter((nodeDef) => NodeDef.isGeo(nodeDef) || NodeDef.isCoordinate(nodeDef)),
+    [survey]
+  )
+  const samplingPointDataLevels = useMemo(() => getSamplingPointDataLevels(survey), [survey])
 
-  const layerColors = useRandomColors(samplingPointDataLevels.length + coordinateAttributeDefs.length)
+  const layerColors = useRandomColors(samplingPointDataLevels.length + geoAttributeDefs.length)
 
   const onRecordEditClick = useCallback((params) => {
     const { recordUuid, parentUuid } = params || {}
@@ -64,35 +66,45 @@ const MapWrapper = () => {
     [surveyId]
   )
 
-  if (samplingPointDataLevels.length + coordinateAttributeDefs.length > 0 && layerColors.length === 0) {
+  const layers = useMemo(
+    () => [
+      ...samplingPointDataLevels.map((level, index) => (
+        <SamplingPointDataLayer
+          key={CategoryLevel.getUuid(level)}
+          levelIndex={CategoryLevel.getIndex(level)}
+          markersColor={layerColors[index]}
+          onRecordEditClick={onRecordEditClick}
+          createRecordFromSamplingPointDataItem={createRecordFromSamplingPointDataItem}
+        />
+      )),
+      ...geoAttributeDefs.map((attributeDef, index) => (
+        <GeoAttributeDataLayer
+          key={NodeDef.getUuid(attributeDef)}
+          attributeDef={attributeDef}
+          markersColor={layerColors[samplingPointDataLevels.length + index]}
+          onRecordEditClick={onRecordEditClick}
+          editingRecordUuid={editingRecordUuid}
+        />
+      )),
+    ],
+    [
+      createRecordFromSamplingPointDataItem,
+      editingRecordUuid,
+      geoAttributeDefs,
+      layerColors,
+      onRecordEditClick,
+      samplingPointDataLevels,
+    ]
+  )
+
+  if (layers.length > 0 && layerColors.length === 0) {
     // layer colors not generated yet
     return null
   }
 
   return (
     <>
-      <Map
-        layers={[
-          ...samplingPointDataLevels.map((level, index) => (
-            <SamplingPointDataLayer
-              key={CategoryLevel.getUuid(level)}
-              levelIndex={CategoryLevel.getIndex(level)}
-              markersColor={layerColors[index]}
-              onRecordEditClick={onRecordEditClick}
-              createRecordFromSamplingPointDataItem={createRecordFromSamplingPointDataItem}
-            />
-          )),
-          ...coordinateAttributeDefs.map((attributeDef, index) => (
-            <CoordinateAttributeDataLayer
-              key={NodeDef.getUuid(attributeDef)}
-              attributeDef={attributeDef}
-              markersColor={layerColors[samplingPointDataLevels.length + index]}
-              onRecordEditClick={onRecordEditClick}
-              editingRecordUuid={editingRecordUuid}
-            />
-          )),
-        ]}
-      />
+      <Map layers={layers} />
       {editingRecordUuid && (
         <RecordEditModal
           initialState={lastRecordEditModalState}
@@ -106,8 +118,4 @@ const MapWrapper = () => {
   )
 }
 
-export const MapView = () => (
-  <SurveyDefsLoader draft={false} requirePublish>
-    <MapWrapper />
-  </SurveyDefsLoader>
-)
+export const MapView = () => <MapWrapper />
diff --git a/webapp/views/App/views/Data/MapView/MapView.scss b/webapp/views/App/views/Data/MapView/MapView.scss
index 6625928ded..756589fa6c 100644
--- a/webapp/views/App/views/Data/MapView/MapView.scss
+++ b/webapp/views/App/views/Data/MapView/MapView.scss
@@ -30,6 +30,11 @@
 
           button {
             margin: 0;
+            height: 2rem;
+          }
+
+          .new-record-btn {
+            width: 20rem;
           }
         }
       }
diff --git a/webapp/views/App/views/Data/MapView/SamplingPointDataLayer/SamplingPointDataItemPopup.js b/webapp/views/App/views/Data/MapView/SamplingPointDataLayer/SamplingPointDataItemPopup.js
index 71ec38977a..b6f9c70c49 100644
--- a/webapp/views/App/views/Data/MapView/SamplingPointDataLayer/SamplingPointDataItemPopup.js
+++ b/webapp/views/App/views/Data/MapView/SamplingPointDataLayer/SamplingPointDataItemPopup.js
@@ -12,7 +12,7 @@ import { ButtonNext } from '@webapp/components/buttons/ButtonNext'
 import { ButtonPrevious } from '@webapp/components/buttons/ButtonPrevious'
 import { useAuthCanCreateRecord } from '@webapp/store/user'
 import { useSurvey } from '@webapp/store/survey'
-import { useAltitude } from '../common/useAltitude'
+import { useElevation } from '../common/useElevation'
 
 export const SamplingPointDataItemPopup = (props) => {
   const { createRecordFromSamplingPointDataItem, flyToNextPoint, flyToPreviousPoint, onRecordEditClick, pointFeature } =
@@ -36,7 +36,7 @@ export const SamplingPointDataItemPopup = (props) => {
 
   const [open, setOpen] = useState(false)
 
-  const altitude = useAltitude({ survey, point, active: open })
+  const elevation = useElevation({ survey, point, active: open })
 
   const content = `**${i18n.t('mapView.samplingPointItemPopup.title')}**
 ${itemCodes
@@ -46,7 +46,7 @@ ${itemCodes
   * **X**: ${point.x}
   * **Y**: ${point.y}
   * **SRS**: ${point.srs}
-* **${i18n.t('mapView.altitude')}**: ${altitude}`
+* **${i18n.t('mapView.elevation')}**: ${elevation}`
 
   const onClickNext = () => {
     flyToNextPoint(pointFeature)
@@ -83,6 +83,7 @@ ${itemCodes
         )}
         {canCreateRecord && !recordUuid && (
           <ButtonAdd
+            className="new-record-btn"
             label="mapView.createRecord"
             showLabel
             onClick={() => createRecordFromSamplingPointDataItem({ itemUuid, callback: onRecordCreate })}
diff --git a/webapp/views/App/views/Data/MapView/SamplingPointDataLayer/useSamplingPointDataLayer.js b/webapp/views/App/views/Data/MapView/SamplingPointDataLayer/useSamplingPointDataLayer.js
index 219f81811d..6793f7037c 100644
--- a/webapp/views/App/views/Data/MapView/SamplingPointDataLayer/useSamplingPointDataLayer.js
+++ b/webapp/views/App/views/Data/MapView/SamplingPointDataLayer/useSamplingPointDataLayer.js
@@ -141,9 +141,8 @@ export const useSamplingPointDataLayer = (props) => {
   // cancel items fetch (if any) on unmount
   useEffect(() => {
     return () => {
-      if (fetchCancelRef.current) {
-        fetchCancelRef.current()
-      }
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+      fetchCancelRef.current?.()
     }
   }, [])
 
diff --git a/webapp/views/App/views/Data/MapView/common/useAltitude.js b/webapp/views/App/views/Data/MapView/common/useElevation.js
similarity index 60%
rename from webapp/views/App/views/Data/MapView/common/useAltitude.js
rename to webapp/views/App/views/Data/MapView/common/useElevation.js
index ada76be179..0370f795ae 100644
--- a/webapp/views/App/views/Data/MapView/common/useAltitude.js
+++ b/webapp/views/App/views/Data/MapView/common/useElevation.js
@@ -6,7 +6,7 @@ import * as Survey from '@core/survey/survey'
 
 import * as API from '@webapp/service/api'
 
-export const useAltitude = ({ survey, point, active = true }) => {
+export const useElevation = ({ survey, point, active = true }) => {
   const surveyId = Survey.getId(survey)
   const surveyInfo = Survey.getSurveyInfo(survey)
   const srsIndex = Survey.getSRSIndex(surveyInfo)
@@ -14,17 +14,17 @@ export const useAltitude = ({ survey, point, active = true }) => {
   const pointLatLng = Points.toLatLong(point, srsIndex)
   const { y: lat, x: lng } = pointLatLng
 
-  const [altitude, setAltitude] = useState('...')
+  const [elevation, setElevation] = useState('...')
 
   useEffect(() => {
-    const fetchAltitude = async () => {
-      const _altitude = await API.fetchAltitude({ surveyId, lat, lng })
-      setAltitude(_altitude === null ? 'error' : _altitude)
+    const fetchElevation = async () => {
+      const _elevation = await API.fetchElevation({ surveyId, lat, lng })
+      setElevation(_elevation === null ? 'error' : _elevation)
     }
     if (active) {
-      fetchAltitude()
+      fetchElevation()
     }
   }, [active, lat, lng, surveyId])
 
-  return altitude
+  return elevation
 }
diff --git a/webapp/views/App/views/Data/MapView/common/useFlyToPoint.js b/webapp/views/App/views/Data/MapView/common/useFlyToPoint.js
index 5050ec6947..89d6ca7f5c 100644
--- a/webapp/views/App/views/Data/MapView/common/useFlyToPoint.js
+++ b/webapp/views/App/views/Data/MapView/common/useFlyToPoint.js
@@ -1,7 +1,9 @@
 import { useCallback, useRef, useState } from 'react'
 import { useMap } from 'react-leaflet'
 
-export const useFlyToPoint = ({ points, onRecordEditClick = null }) => {
+import * as NumberUtils from '@core/numberUtils'
+
+export const useFlyToPoint = ({ points, onRecordEditClick = null, zoomToMaxLevel = true }) => {
   const map = useMap()
 
   const [state, setState] = useState({})
@@ -32,21 +34,16 @@ export const useFlyToPoint = ({ points, onRecordEditClick = null }) => {
 
   const getPointIndex = useCallback((point) => points.findIndex((p) => getPointKey(p) === getPointKey(point)), [points])
 
-  const getNextPoint = useCallback(
-    (point) => {
-      const index = getPointIndex(point)
-      return points[(index + 1) % points.length]
-    },
-    [getPointIndex, points]
-  )
-
-  const getPreviousPoint = useCallback(
-    (point) => {
+  const getPointByOffset = useCallback(
+    (point, offset) => {
       const index = getPointIndex(point)
-      return points[index > 0 ? index - 1 : points.length - 1]
+      const indexNext = NumberUtils.mod(points.length)(index + offset)
+      return points[indexNext]
     },
     [getPointIndex, points]
   )
+  const getNextPoint = useCallback((point) => getPointByOffset(point, 1), [getPointByOffset])
+  const getPreviousPoint = useCallback((point) => getPointByOffset(point, -1), [getPointByOffset])
 
   const flyToPoint = useCallback(
     (point) => {
@@ -54,10 +51,11 @@ export const useFlyToPoint = ({ points, onRecordEditClick = null }) => {
       onRecordEditClick?.(null)
 
       const [longitude, latitude] = point.geometry.coordinates
-      map.flyTo([latitude, longitude], map.getMaxZoom())
+      const nextZoomLevel = zoomToMaxLevel ? map.getMaxZoom() : undefined
+      map.flyTo([latitude, longitude], nextZoomLevel)
       map.once('zoomend', () => openPopupOfPoint(point))
     },
-    [map, onRecordEditClick, openPopupOfPoint]
+    [map, onRecordEditClick, openPopupOfPoint, zoomToMaxLevel]
   )
 
   const flyToNextPoint = useCallback(
diff --git a/webapp/views/App/views/Designer/SurveyHierarchy/SurveyHierarchy.js b/webapp/views/App/views/Designer/SurveyHierarchy/SurveyHierarchy.js
index 7cf65eee8d..8b74141c98 100644
--- a/webapp/views/App/views/Designer/SurveyHierarchy/SurveyHierarchy.js
+++ b/webapp/views/App/views/Designer/SurveyHierarchy/SurveyHierarchy.js
@@ -5,7 +5,7 @@ import React, { useEffect, useState, useRef } from 'react'
 import * as Survey from '@core/survey/survey'
 import * as NodeDef from '@core/survey/nodeDef'
 
-import { useSurvey, useSurveyPreferredLang } from '@webapp/store/survey'
+import { useSurvey, useSurveyCycleKey, useSurveyPreferredLang } from '@webapp/store/survey'
 import { useI18n } from '@webapp/store/system'
 
 import { NodeDefsSelector } from '@webapp/components/survey/NodeDefsSelector'
@@ -17,10 +17,11 @@ import Tree from './Tree'
 const SurveyHierarchy = () => {
   const survey = useSurvey()
   const lang = useSurveyPreferredLang()
+  const cycle = useSurveyCycleKey()
   const i18n = useI18n()
   const { nodeDefLabelType, toggleLabelFunction } = useNodeDefLabelSwitch()
 
-  const hierarchy = Survey.getHierarchy(NodeDef.isEntity)(survey)
+  const hierarchy = Survey.getHierarchy(NodeDef.isEntity, cycle)(survey)
 
   const [selectedNodeDefUuid, setSelectedNodeDefUuid] = useState(null)
   const [tree, setTree] = useState(null)
diff --git a/webapp/views/App/views/Home/CollectImportReport/Row/Row.js b/webapp/views/App/views/Home/CollectImportReport/Row/Row.js
index 2ea0afe5dd..c20e8c75af 100644
--- a/webapp/views/App/views/Home/CollectImportReport/Row/Row.js
+++ b/webapp/views/App/views/Home/CollectImportReport/Row/Row.js
@@ -23,14 +23,14 @@ const Row = (props) => {
   return (
     <>
       <div>{rowNo}</div>
-      <div className="full-width">{nodeDefPath}</div>
+      <div className="width100">{nodeDefPath}</div>
       <div>
         {typeIcon}
         {typeLabel}
       </div>
-      <div className="full-width">{CollectImportReportItem.getExpression(row)}</div>
-      <div className="full-width">{CollectImportReportItem.getApplyIf(row)}</div>
-      <div className="full-width">
+      <div className="width100">{CollectImportReportItem.getExpression(row)}</div>
+      <div className="width100">{CollectImportReportItem.getApplyIf(row)}</div>
+      <div className="width100">
         <LabelsEditor
           labels={CollectImportReportItem.getMessages(row)}
           readOnly
diff --git a/webapp/views/App/views/Home/Dashboard/ActivityLog/ActivityLog.scss b/webapp/views/App/views/Home/Dashboard/ActivityLog/ActivityLog.scss
index 21a25b551d..a841da2901 100644
--- a/webapp/views/App/views/Home/Dashboard/ActivityLog/ActivityLog.scss
+++ b/webapp/views/App/views/Home/Dashboard/ActivityLog/ActivityLog.scss
@@ -74,23 +74,3 @@
     color: $blueDark;
   }
 }
-
-.btn-expand {
-  position: absolute;
-  right: 4px;
-  top: 4px;
-  border: none;
-  background-color: transparent;
-  text-align: left;
-  color: $white;
-
-  &:hover {
-    color: $orange;
-    background-color: transparent;
-  }
-
-  &.active {
-    font-weight: bold;
-    background-color: transparent;
-  }
-}
diff --git a/webapp/views/App/views/Home/SurveyInfo/SrsEditor/SrsEditor.scss b/webapp/views/App/views/Home/SurveyInfo/SrsEditor/SrsEditor.scss
index 9ebfc2f500..3a017df4cf 100644
--- a/webapp/views/App/views/Home/SurveyInfo/SrsEditor/SrsEditor.scss
+++ b/webapp/views/App/views/Home/SurveyInfo/SrsEditor/SrsEditor.scss
@@ -1,4 +1,4 @@
-.srs_editor__input_chips {
+.srs_editor__input_chips.form-input-chip {
   .dropdown-wrapper,
   .dropdown {
     width: 20rem;
diff --git a/webpack.config.babel.js b/webpack.config.babel.js
index f1cb36552a..09b7b0b24a 100644
--- a/webpack.config.babel.js
+++ b/webpack.config.babel.js
@@ -63,6 +63,7 @@ const plugins = [
           : JSON.stringify(process.env.APP_VERSION),
         RECAPTCHA_ENABLED: process.env.RECAPTCHA_ENABLED,
         RECAPTCHA_SITE_KEY: JSON.stringify(process.env.RECAPTCHA_SITE_KEY),
+        EXPERIMENTAL_FEATURES: process.env.EXPERIMENTAL_FEATURES,
       },
     },
   }),
diff --git a/yarn.lock b/yarn.lock
index 7f7becf6f4..ec96e43c63 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1805,6 +1805,13 @@
   dependencies:
     regenerator-runtime "^0.14.0"
 
+"@babel/runtime@^7.18.6":
+  version "7.25.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.6.tgz#9afc3289f7184d8d7f98b099884c26317b9264d2"
+  integrity sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==
+  dependencies:
+    regenerator-runtime "^0.14.0"
+
 "@babel/template@^7.22.5", "@babel/template@^7.3.3":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec"
@@ -1875,6 +1882,93 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
+"@codemirror/autocomplete@^6.0.0", "@codemirror/autocomplete@^6.18.0":
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/@codemirror/autocomplete/-/autocomplete-6.18.0.tgz#5f39b05daca04c95e990b70024144df47b2aa635"
+  integrity sha512-5DbOvBbY4qW5l57cjDsmmpDh3/TeK1vXfTHa+BUMrRzdWdcxKZ4U4V7vQaTtOpApNU4kLS4FQ6cINtLg245LXA==
+  dependencies:
+    "@codemirror/language" "^6.0.0"
+    "@codemirror/state" "^6.0.0"
+    "@codemirror/view" "^6.17.0"
+    "@lezer/common" "^1.0.0"
+
+"@codemirror/commands@^6.0.0", "@codemirror/commands@^6.1.0":
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/@codemirror/commands/-/commands-6.6.0.tgz#d308f143fe1b8896ca25fdb855f66acdaf019dd4"
+  integrity sha512-qnY+b7j1UNcTS31Eenuc/5YJB6gQOzkUoNmJQc0rznwqSRpeaWWpjkWy2C/MPTcePpsKJEM26hXrOXl1+nceXg==
+  dependencies:
+    "@codemirror/language" "^6.0.0"
+    "@codemirror/state" "^6.4.0"
+    "@codemirror/view" "^6.27.0"
+    "@lezer/common" "^1.1.0"
+
+"@codemirror/lang-javascript@^6.2.2":
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/@codemirror/lang-javascript/-/lang-javascript-6.2.2.tgz#7141090b22994bef85bcc5608a3bc1257f2db2ad"
+  integrity sha512-VGQfY+FCc285AhWuwjYxQyUQcYurWlxdKYT4bqwr3Twnd5wP5WSeu52t4tvvuWmljT4EmgEgZCqSieokhtY8hg==
+  dependencies:
+    "@codemirror/autocomplete" "^6.0.0"
+    "@codemirror/language" "^6.6.0"
+    "@codemirror/lint" "^6.0.0"
+    "@codemirror/state" "^6.0.0"
+    "@codemirror/view" "^6.17.0"
+    "@lezer/common" "^1.0.0"
+    "@lezer/javascript" "^1.0.0"
+
+"@codemirror/language@^6.0.0", "@codemirror/language@^6.6.0":
+  version "6.10.2"
+  resolved "https://registry.yarnpkg.com/@codemirror/language/-/language-6.10.2.tgz#4056dc219619627ffe995832eeb09cea6060be61"
+  integrity sha512-kgbTYTo0Au6dCSc/TFy7fK3fpJmgHDv1sG1KNQKJXVi+xBTEeBPY/M30YXiU6mMXeH+YIDLsbrT4ZwNRdtF+SA==
+  dependencies:
+    "@codemirror/state" "^6.0.0"
+    "@codemirror/view" "^6.23.0"
+    "@lezer/common" "^1.1.0"
+    "@lezer/highlight" "^1.0.0"
+    "@lezer/lr" "^1.0.0"
+    style-mod "^4.0.0"
+
+"@codemirror/lint@^6.0.0":
+  version "6.8.1"
+  resolved "https://registry.yarnpkg.com/@codemirror/lint/-/lint-6.8.1.tgz#6427848815baaf68c08e98c7673b804d3d8c0e7f"
+  integrity sha512-IZ0Y7S4/bpaunwggW2jYqwLuHj0QtESf5xcROewY6+lDNwZ/NzvR4t+vpYgg9m7V8UXLPYqG+lu3DF470E5Oxg==
+  dependencies:
+    "@codemirror/state" "^6.0.0"
+    "@codemirror/view" "^6.0.0"
+    crelt "^1.0.5"
+
+"@codemirror/search@^6.0.0":
+  version "6.5.6"
+  resolved "https://registry.yarnpkg.com/@codemirror/search/-/search-6.5.6.tgz#8f858b9e678d675869112e475f082d1e8488db93"
+  integrity sha512-rpMgcsh7o0GuCDUXKPvww+muLA1pDJaFrpq/CCHtpQJYz8xopu4D1hPcKRoDD0YlF8gZaqTNIRa4VRBWyhyy7Q==
+  dependencies:
+    "@codemirror/state" "^6.0.0"
+    "@codemirror/view" "^6.0.0"
+    crelt "^1.0.5"
+
+"@codemirror/state@^6.0.0", "@codemirror/state@^6.1.1", "@codemirror/state@^6.4.0":
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-6.4.1.tgz#da57143695c056d9a3c38705ed34136e2b68171b"
+  integrity sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A==
+
+"@codemirror/theme-one-dark@^6.0.0":
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/@codemirror/theme-one-dark/-/theme-one-dark-6.1.2.tgz#fcef9f9cfc17a07836cb7da17c9f6d7231064df8"
+  integrity sha512-F+sH0X16j/qFLMAfbciKTxVOwkdAS336b7AXTKOZhy8BR3eH/RelsnLgLFINrpST63mmN2OuwUt0W2ndUgYwUA==
+  dependencies:
+    "@codemirror/language" "^6.0.0"
+    "@codemirror/state" "^6.0.0"
+    "@codemirror/view" "^6.0.0"
+    "@lezer/highlight" "^1.0.0"
+
+"@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0", "@codemirror/view@^6.27.0":
+  version "6.33.0"
+  resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-6.33.0.tgz#51e270410fc3af92a6e38798e80ebf8add7dc3ec"
+  integrity sha512-AroaR3BvnjRW8fiZBalAaK+ZzB5usGgI014YKElYZvQdNH5ZIidHlO+cyf/2rWzyBFRkvG6VhiXeAEbC53P2YQ==
+  dependencies:
+    "@codemirror/state" "^6.4.0"
+    style-mod "^4.1.0"
+    w3c-keyname "^2.2.4"
+
 "@colors/colors@1.5.0":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
@@ -2408,6 +2502,34 @@
   resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"
   integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==
 
+"@lezer/common@^1.0.0", "@lezer/common@^1.1.0", "@lezer/common@^1.2.0":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@lezer/common/-/common-1.2.1.tgz#198b278b7869668e1bebbe687586e12a42731049"
+  integrity sha512-yemX0ZD2xS/73llMZIK6KplkjIjf2EvAHcinDi/TfJ9hS25G0388+ClHt6/3but0oOxinTcQHJLDXh6w1crzFQ==
+
+"@lezer/highlight@^1.0.0", "@lezer/highlight@^1.1.3":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@lezer/highlight/-/highlight-1.2.1.tgz#596fa8f9aeb58a608be0a563e960c373cbf23f8b"
+  integrity sha512-Z5duk4RN/3zuVO7Jq0pGLJ3qynpxUVsh7IbUbGj88+uV2ApSAn6kWg2au3iJb+0Zi7kKtqffIESgNcRXWZWmSA==
+  dependencies:
+    "@lezer/common" "^1.0.0"
+
+"@lezer/javascript@^1.0.0":
+  version "1.4.17"
+  resolved "https://registry.yarnpkg.com/@lezer/javascript/-/javascript-1.4.17.tgz#8456e369f960c328b9e823342d0c72d704238c31"
+  integrity sha512-bYW4ctpyGK+JMumDApeUzuIezX01H76R1foD6LcRX224FWfyYit/HYxiPGDjXXe/wQWASjCvVGoukTH68+0HIA==
+  dependencies:
+    "@lezer/common" "^1.2.0"
+    "@lezer/highlight" "^1.1.3"
+    "@lezer/lr" "^1.3.0"
+
+"@lezer/lr@^1.0.0", "@lezer/lr@^1.3.0":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@lezer/lr/-/lr-1.4.2.tgz#931ea3dea8e9de84e90781001dae30dea9ff1727"
+  integrity sha512-pu0K1jCIdnQ12aWNaAVU5bzi7Bd1w54J3ECgANPmYLtQKP0HBj2cE/5coBD66MT10xbtIuUr7tg0Shbsvk0mDA==
+  dependencies:
+    "@lezer/common" "^1.0.0"
+
 "@mui/core-downloads-tracker@^6.0.0":
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-6.0.0.tgz#308e658bc1e766d2e9a5a8cf65503500535051e1"
@@ -2655,10 +2777,10 @@
     proj4 "^2.11.0"
     uuid "^9.0.1"
 
-"@openforis/arena-core@^0.0.203":
-  version "0.0.203"
-  resolved "https://npm.pkg.github.com/download/@openforis/arena-core/0.0.203/bfa7cb39eda558cba1d03f21f07b654f987c19ee#bfa7cb39eda558cba1d03f21f07b654f987c19ee"
-  integrity sha512-aGMKPWMP97wO7aHzMN40HmisTQyLOQtfyDuUpNItMVD95CIE5fV8vJ2xYjDdwPTUXKh5Q6RAzTfAG+XchYxZdA==
+"@openforis/arena-core@^0.0.204":
+  version "0.0.204"
+  resolved "https://npm.pkg.github.com/download/@openforis/arena-core/0.0.204/aa4aec1004bbd93b778ea3d720f165501f0b4f26#aa4aec1004bbd93b778ea3d720f165501f0b4f26"
+  integrity sha512-RwcJZD2IU/CBKhktLZZxMb0DzA8afHJSXg6GEzpnJI+VDU6NPhqNyQnNuzWZRotDh8XiU2gctbiLN6Vg0BoIJA==
   dependencies:
     "@jsep-plugin/regex" "^1.0.3"
     bignumber.js "^9.1.2"
@@ -3315,6 +3437,72 @@
   resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
   integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
 
+"@turf/area@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@turf/area/-/area-7.1.0.tgz#c8b506cfa9f8b06570c090c9cf915fa080ae7b66"
+  integrity sha512-w91FEe02/mQfMPRX2pXua48scFuKJ2dSVMF2XmJ6+BJfFiCPxp95I3+Org8+ZsYv93CDNKbf0oLNEPnuQdgs2g==
+  dependencies:
+    "@turf/helpers" "^7.1.0"
+    "@turf/meta" "^7.1.0"
+    "@types/geojson" "^7946.0.10"
+    tslib "^2.6.2"
+
+"@turf/centroid@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@turf/centroid/-/centroid-7.1.0.tgz#7cd55ec0bab79b5fc0ef03a4870a8cbc75e6207f"
+  integrity sha512-1Y1b2l+ZB1CZ+ITjUCsGqC4/tSjwm/R4OUfDztVqyyCq/VvezkLmTNqvXTGXgfP0GXkpv68iCfxF5M7QdM5pJQ==
+  dependencies:
+    "@turf/helpers" "^7.1.0"
+    "@turf/meta" "^7.1.0"
+    "@types/geojson" "^7946.0.10"
+    tslib "^2.6.2"
+
+"@turf/distance@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@turf/distance/-/distance-7.1.0.tgz#12317573f9774e1c9d6fb08bf90338d9904d2f1d"
+  integrity sha512-hhNHhxCHB3ddzAGCNY4BtE29OZh+DAJPvUapQz+wOjISnlwvMcwLKvslgHWSYF536QDVe/93FEU2q67+CsZTPA==
+  dependencies:
+    "@turf/helpers" "^7.1.0"
+    "@turf/invariant" "^7.1.0"
+    "@types/geojson" "^7946.0.10"
+    tslib "^2.6.2"
+
+"@turf/helpers@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@turf/helpers/-/helpers-7.1.0.tgz#eb734e291c9c205822acdd289fe20e91c3cb1641"
+  integrity sha512-dTeILEUVeNbaEeoZUOhxH5auv7WWlOShbx7QSd4s0T4Z0/iz90z9yaVCtZOLbU89umKotwKaJQltBNO9CzVgaQ==
+  dependencies:
+    "@types/geojson" "^7946.0.10"
+    tslib "^2.6.2"
+
+"@turf/invariant@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@turf/invariant/-/invariant-7.1.0.tgz#c90cffa093291316b597212396d68bf9e465cf2e"
+  integrity sha512-OCLNqkItBYIP1nE9lJGuIUatWGtQ4rhBKAyTfFu0z8npVzGEYzvguEeof8/6LkKmTTEHW53tCjoEhSSzdRh08Q==
+  dependencies:
+    "@turf/helpers" "^7.1.0"
+    "@types/geojson" "^7946.0.10"
+    tslib "^2.6.2"
+
+"@turf/length@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@turf/length/-/length-7.1.0.tgz#bd04f024e1dfa8c4d767175ebbe6411bb8c52c82"
+  integrity sha512-wUJj9WLKEudG1ngNao2ZwD+Dt6UkvWIbubuJ6lR6FndFDL3iezFhNGy0IXS+0xH9kXi2apiTnM9Vk5+i8BTEvQ==
+  dependencies:
+    "@turf/distance" "^7.1.0"
+    "@turf/helpers" "^7.1.0"
+    "@turf/meta" "^7.1.0"
+    "@types/geojson" "^7946.0.10"
+    tslib "^2.6.2"
+
+"@turf/meta@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@turf/meta/-/meta-7.1.0.tgz#b2af85afddd0ef08aeae8694a12370a4f06b6d13"
+  integrity sha512-ZgGpWWiKz797Fe8lfRj7HKCkGR+nSJ/5aKXMyofCvLSc2PuYJs/qyyifDPWjASQQCzseJ7AlF2Pc/XQ/3XkkuA==
+  dependencies:
+    "@turf/helpers" "^7.1.0"
+    "@types/geojson" "^7946.0.10"
+
 "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14":
   version "7.20.1"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.1.tgz#916ecea274b0c776fec721e333e55762d3a9614b"
@@ -3495,6 +3683,11 @@
     "@types/jsonfile" "*"
     "@types/node" "*"
 
+"@types/geojson@^7946.0.10":
+  version "7946.0.14"
+  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.14.tgz#319b63ad6df705ee2a65a73ef042c8271e696613"
+  integrity sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==
+
 "@types/graceful-fs@^4.1.2":
   version "4.1.6"
   resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.6.tgz#e14b2576a1c25026b7f02ede1de3b84c3a1efeae"
@@ -3783,6 +3976,31 @@
     "@typescript-eslint/types" "5.62.0"
     eslint-visitor-keys "^3.3.0"
 
+"@uiw/codemirror-extensions-basic-setup@4.23.0":
+  version "4.23.0"
+  resolved "https://registry.yarnpkg.com/@uiw/codemirror-extensions-basic-setup/-/codemirror-extensions-basic-setup-4.23.0.tgz#c3c181153335c208a25d59b8ecbc7fc87fe85356"
+  integrity sha512-+k5nkRpUWGaHr1JWT8jcKsVewlXw5qBgSopm9LW8fZ6KnSNZBycz8kHxh0+WSvckmXEESGptkIsb7dlkmJT/hQ==
+  dependencies:
+    "@codemirror/autocomplete" "^6.0.0"
+    "@codemirror/commands" "^6.0.0"
+    "@codemirror/language" "^6.0.0"
+    "@codemirror/lint" "^6.0.0"
+    "@codemirror/search" "^6.0.0"
+    "@codemirror/state" "^6.0.0"
+    "@codemirror/view" "^6.0.0"
+
+"@uiw/react-codemirror@^4.23.0":
+  version "4.23.0"
+  resolved "https://registry.yarnpkg.com/@uiw/react-codemirror/-/react-codemirror-4.23.0.tgz#5eeadcd5de61213ad76ac3c772fffb7e5b54b465"
+  integrity sha512-MnqTXfgeLA3fsUUQjqjJgemEuNyoGALgsExVm0NQAllAAi1wfj+IoKFeK+h3XXMlTFRCFYOUh4AHDv0YXJLsOg==
+  dependencies:
+    "@babel/runtime" "^7.18.6"
+    "@codemirror/commands" "^6.1.0"
+    "@codemirror/state" "^6.1.1"
+    "@codemirror/theme-one-dark" "^6.0.0"
+    "@uiw/codemirror-extensions-basic-setup" "4.23.0"
+    codemirror "^6.0.0"
+
 "@ungap/structured-clone@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
@@ -5294,10 +5512,18 @@ co@^4.6.0:
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
 
-codemirror@^5.65.5:
-  version "5.65.17"
-  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.17.tgz#00d71f34c3518471ae4c0de23a2f8bb39a6df6ca"
-  integrity sha512-1zOsUx3lzAOu/gnMAZkQ9kpIHcPYOc9y1Fbm2UVk5UBPkdq380nhkelG0qUwm1f7wPvTbndu9ZYlug35EwAZRQ==
+codemirror@^6.0.0, codemirror@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-6.0.1.tgz#62b91142d45904547ee3e0e0e4c1a79158035a29"
+  integrity sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==
+  dependencies:
+    "@codemirror/autocomplete" "^6.0.0"
+    "@codemirror/commands" "^6.0.0"
+    "@codemirror/language" "^6.0.0"
+    "@codemirror/lint" "^6.0.0"
+    "@codemirror/search" "^6.0.0"
+    "@codemirror/state" "^6.0.0"
+    "@codemirror/view" "^6.0.0"
 
 collect-v8-coverage@^1.0.0:
   version "1.0.2"
@@ -5606,6 +5832,11 @@ crc32-stream@^6.0.0:
     crc-32 "^1.2.0"
     readable-stream "^4.0.0"
 
+crelt@^1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/crelt/-/crelt-1.0.6.tgz#7cc898ea74e190fb6ef9dae57f8f81cf7302df72"
+  integrity sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==
+
 cron-parser@^4.2.0:
   version "4.8.1"
   resolved "https://registry.yarnpkg.com/cron-parser/-/cron-parser-4.8.1.tgz#47062ea63d21d78c10ddedb08ea4c5b6fc2750fb"
@@ -13985,6 +14216,11 @@ style-loader@^3.3.4:
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.4.tgz#f30f786c36db03a45cbd55b6a70d930c479090e7"
   integrity sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==
 
+style-mod@^4.0.0, style-mod@^4.1.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/style-mod/-/style-mod-4.1.2.tgz#ca238a1ad4786520f7515a8539d5a63691d7bf67"
+  integrity sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==
+
 stylehacks@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.1.tgz#7934a34eb59d7152149fa69d6e9e56f2fc34bcc9"
@@ -14759,6 +14995,11 @@ w3c-hr-time@^1.0.2:
   dependencies:
     browser-process-hrtime "^1.0.0"
 
+w3c-keyname@^2.2.4:
+  version "2.2.8"
+  resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.8.tgz#7b17c8c6883d4e8b86ac8aba79d39e880f8869c5"
+  integrity sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==
+
 w3c-xmlserializer@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a"