diff --git a/common/model/query/query/defaults.js b/common/model/query/query/defaults.js
index b6ad60668d..dafe6bc8d9 100644
--- a/common/model/query/query/defaults.js
+++ b/common/model/query/query/defaults.js
@@ -10,5 +10,5 @@ export const defaults = {
   [keys.entityDefUuid]: null,
   [keys.attributeDefUuids]: [],
   [keys.dimensions]: [],
-  [keys.measures]: new Map(),
+  [keys.measures]: {},
 }
diff --git a/common/model/query/query/query.js b/common/model/query/query/query.js
index 882706d7ed..971eda5953 100644
--- a/common/model/query/query/query.js
+++ b/common/model/query/query/query.js
@@ -27,21 +27,25 @@ export const create = ({
 })
 
 // ====== READ
-export { displayTypes }
+export { displayTypes, modes }
+const getPropOrDefault = (key) => A.propOr(defaults[key], key)
 export const getMode = A.prop(keys.mode)
 export const getDisplayType = A.prop(keys.displayType)
 export const getFilter = A.prop(keys.filter)
 export const getFilterRecordUuid = A.prop(keys.filterRecordUuid)
 export const getFilterRecordUuids = A.prop(keys.filterRecordUuids)
-export const getSort = A.prop(keys.sort)
+export const getSort = getPropOrDefault(keys.sort)
 export const getEntityDefUuid = A.prop(keys.entityDefUuid)
-export const getAttributeDefUuids = A.prop(keys.attributeDefUuids)
-export const getDimensions = A.prop(keys.dimensions)
-export const getMeasures = A.prop(keys.measures)
+export const getAttributeDefUuids = getPropOrDefault(keys.attributeDefUuids)
+export const getDimensions = getPropOrDefault(keys.dimensions)
+export const getMeasures = getPropOrDefault(keys.measures)
+export const getMeasuresKeys = A.pipe(getMeasures, Object.keys)
+export const getMeasureAggregateFunctions = (nodeDefUuid) => (query) => getMeasures(query)?.[nodeDefUuid] ?? []
 
 // mode
 const isMode = (mode) => (query) => getMode(query) === mode
 export const isModeAggregate = isMode(modes.aggregate)
+export const isModeRaw = isMode(modes.raw)
 export const isModeRawEdit = isMode(modes.rawEdit)
 
 // utils
@@ -59,23 +63,24 @@ export const assocFilter = A.assoc(keys.filter)
 export const assocFilterRecordUuid = A.assoc(keys.filterRecordUuid)
 export const assocFilterRecordUuids = A.assoc(keys.filterRecordUuids)
 export const assocSort = A.assoc(keys.sort)
-export const assocMode = A.assoc(keys.mode)
 
-// mode
-export const toggleModeAggregate = (query) => ({
-  ...create({ entityDefUuid: getEntityDefUuid(query) }),
-  [keys.mode]: isModeAggregate(query) ? modes.raw : modes.aggregate,
-})
-export const toggleModeEdit = (query) => ({
-  ...query,
-  [keys.mode]: isModeRawEdit(query) ? modes.raw : modes.rawEdit,
-})
+const cleanup = (query) => {
+  if (isModeAggregate(query)) {
+    return assocAttributeDefUuids([])(query)
+  } else if (isModeRaw(query)) {
+    return A.pipe(assocDimensions(defaults[keys.dimensions]), assocMeasures(defaults[keys.measures]))(query)
+  }
+  return query
+}
+
+export const assocMode = (mode) => A.pipe(A.assoc(keys.mode, mode), cleanup)
 
 export const toggleMeasureAggregateFunction =
   ({ nodeDefUuid, aggregateFn }) =>
   (query) => {
     const measures = getMeasures(query)
-    const aggregateFns = measures.get(nodeDefUuid)
+    const aggregateFns = measures[nodeDefUuid] ?? []
     const aggregateFnsUpdated = ArrayUtils.addOrRemoveItem({ item: aggregateFn })(aggregateFns)
-    return assocMeasures(measures.set(nodeDefUuid, aggregateFnsUpdated))(query)
+    const measuresUpdated = { ...measures, [nodeDefUuid]: aggregateFnsUpdated }
+    return assocMeasures(measuresUpdated)(query)
   }
diff --git a/core/i18n/resources/en.js b/core/i18n/resources/en.js
index f417e913a9..5ef55b9e01 100644
--- a/core/i18n/resources/en.js
+++ b/core/i18n/resources/en.js
@@ -673,12 +673,21 @@ Are you sure you want to continue?`,
   },
 
   dataView: {
-    aggregateMode: 'Aggregate Mode',
+    dataQuery: {
+      deleteConfirmMessage: 'Delete the query "{{name}}"?',
+      manageQueries: 'Manage queries',
+      mode: {
+        label: 'Mode:',
+        aggregate: 'Aggregate',
+        raw: 'Raw',
+        rawEdit: 'Raw edit',
+      },
+      replaceQueryConfirmMessage: 'Replace current query with the selected one?',
+    },
     editSelectedRecord: 'Edit selected record',
-    editMode: 'Edit Mode',
     filterAttributeTypes: 'Filter attribute types',
     filterRecords: {
-      buttonTitle: 'Filter records',
+      buttonTitle: 'Filter',
       expressionEditorHeader: 'Expression to filter records',
     },
     invalidRecord: 'Invalid record',
@@ -739,7 +748,7 @@ Are you sure you want to continue?`,
       label: 'Selected attributes:',
     },
     showValidationReport: 'Show validation report',
-    sort: 'Sort records',
+    sort: 'Sort',
     dataExport: {
       source: {
         label: 'Source',
diff --git a/package.json b/package.json
index 5ec6b5dfbd..8b184db8c2 100644
--- a/package.json
+++ b/package.json
@@ -106,8 +106,8 @@
     "@mui/material": "^5.15.11",
     "@mui/x-data-grid": "^6.19.5",
     "@mui/x-date-pickers": "^6.19.5",
-    "@openforis/arena-core": "^0.0.183",
-    "@openforis/arena-server": "^0.1.31",
+    "@openforis/arena-core": "^0.0.188",
+    "@openforis/arena-server": "^0.1.32",
     "@reduxjs/toolkit": "^2.2.1",
     "@sendgrid/mail": "^8.1.1",
     "@shopify/draggable": "^1.1.3",
diff --git a/server/modules/reporting/api/reportingApi.js b/server/modules/reporting/api/reportingApi.js
index 24ea6c0d4e..08a13f5d7a 100644
--- a/server/modules/reporting/api/reportingApi.js
+++ b/server/modules/reporting/api/reportingApi.js
@@ -35,7 +35,7 @@ export const init = (app) => {
 
       const chartSpec = A.parse(chart)
 
-      let query = A.parse(queryParam)
+      let query = queryParam
 
       const limit = chartSpec.chartType === 'scatterPlot' ? 10000 : null
 
@@ -57,21 +57,20 @@ export const init = (app) => {
 
         query = Query.assocDimensions([groupByFieldUuid])(query)
 
-        // Convert measures to a Map object before passing it to Query.assocMeasures
-        const measures = new Map(
-          Object.entries({
-            [metricFieldUuid]: [aggregateFunction],
-          })
-        )
+        const measures = { [metricFieldUuid]: [aggregateFunction] }
 
         query = Query.assocMeasures(measures)(query)
 
         query = Query.assocMode(mode)(query)
       }
-      const data = await SurveyRdbService.fetchViewData({ user, surveyId, cycle, query, limit })
+      if (Query.hasSelection(query)) {
+        const data = await SurveyRdbService.fetchViewData({ user, surveyId, cycle, query, limit })
 
-      const chartResult = await generateChart({ chartSpec, data })
-      res.json({ chartResult })
+        const chartResult = await generateChart({ chartSpec, data })
+        res.json({ chartResult })
+      } else {
+        res.json({ chartResult: [] })
+      }
     } catch (error) {
       next(error)
     }
diff --git a/server/modules/surveyRdb/api/surveyRdbApi.js b/server/modules/surveyRdb/api/surveyRdbApi.js
index 0c67c8d431..9eeaac8b05 100644
--- a/server/modules/surveyRdb/api/surveyRdbApi.js
+++ b/server/modules/surveyRdb/api/surveyRdbApi.js
@@ -1,5 +1,3 @@
-import * as A from '../../../../core/arena'
-
 import * as Request from '../../../utils/request'
 import * as Response from '../../../utils/response'
 import * as FileUtils from '../../../utils/file/fileUtils'
@@ -23,9 +21,8 @@ export const init = (app) => {
 
   app.post('/surveyRdb/:surveyId/:nodeDefUuidTable/query', requireRecordListViewPermission, async (req, res, next) => {
     try {
-      const { surveyId, cycle, query: queryParam, offset, limit } = Request.getParams(req)
+      const { surveyId, cycle, query, offset, limit } = Request.getParams(req)
       const user = Request.getUser(req)
-      const query = A.parse(queryParam)
 
       const rows = await SurveyRdbService.fetchViewData({ user, surveyId, cycle, query, offset, limit })
 
@@ -40,11 +37,9 @@ export const init = (app) => {
     requireRecordListViewPermission,
     async (req, res, next) => {
       try {
-        const { surveyId, cycle, query: queryParam } = Request.getParams(req)
+        const { surveyId, cycle, query } = Request.getParams(req)
         const user = Request.getUser(req)
 
-        const query = A.parse(queryParam)
-
         const count = await SurveyRdbService.countTable({ user, surveyId, cycle, query })
 
         res.json(count)
@@ -75,9 +70,8 @@ export const init = (app) => {
     requireRecordListViewPermission,
     async (req, res, next) => {
       try {
-        const { surveyId, cycle, query: queryParam } = Request.getParams(req)
+        const { surveyId, cycle, query } = Request.getParams(req)
         const user = Request.getUser(req)
-        const query = A.parse(queryParam)
 
         const tempFileName = await SurveyRdbService.exportViewDataToTempFile({
           user,
diff --git a/server/modules/surveyRdb/manager/surveyRdbCsvExport.js b/server/modules/surveyRdb/manager/surveyRdbCsvExport.js
index 165adf8955..85149d8d83 100644
--- a/server/modules/surveyRdb/manager/surveyRdbCsvExport.js
+++ b/server/modules/surveyRdb/manager/surveyRdbCsvExport.js
@@ -102,7 +102,7 @@ const getCsvExportFieldsAgg = ({ survey, query }) => {
     fields.push(new ColumnNodeDef(viewDataNodeDef, nodeDefDimension).name)
   })
   // measures
-  Array.from(Query.getMeasures(query).entries()).forEach(([nodeDefUuid, aggFunctions]) => {
+  Object.entries(Query.getMeasures(query)).forEach(([nodeDefUuid, aggFunctions]) => {
     const nodeDefMeasure = Survey.getNodeDefByUuid(nodeDefUuid)(survey)
     aggFunctions.forEach((aggregateFnOrUuid) => {
       const fieldAlias = ColumnNodeDef.getColumnNameAggregateFunction({
diff --git a/server/modules/surveyRdb/repository/dataView/readAgg.js b/server/modules/surveyRdb/repository/dataView/readAgg.js
index 8914020f88..f076314656 100644
--- a/server/modules/surveyRdb/repository/dataView/readAgg.js
+++ b/server/modules/surveyRdb/repository/dataView/readAgg.js
@@ -20,8 +20,7 @@ const _getSelectQuery = ({ survey, cycle, recordOwnerUuid, query }) => {
   const queryBuilder = new SqlSelectAggBuilder({ viewDataNodeDef })
 
   // SELECT measures
-  const measures = Query.getMeasures(query)
-  Array.from(measures.entries()).forEach(([nodeDefUuid, aggFunctions], index) =>
+  Object.entries(Query.getMeasures(query)).forEach(([nodeDefUuid, aggFunctions], index) =>
     queryBuilder.selectMeasure({ aggFunctions, nodeDefUuid, index, cycle, filter: Query.getFilter(query) })
   )
 
diff --git a/webapp/components/DataQuery/ButtonBar/ButtonBar.js b/webapp/components/DataQuery/ButtonBar/ButtonBar.js
index 22b6cfb7bc..8386dec1ba 100644
--- a/webapp/components/DataQuery/ButtonBar/ButtonBar.js
+++ b/webapp/components/DataQuery/ButtonBar/ButtonBar.js
@@ -5,6 +5,10 @@ import classNames from 'classnames'
 
 import { Query } from '@common/model/query'
 
+import NodeDefLabelSwitch from '@webapp/components/survey/NodeDefLabelSwitch'
+import { ButtonGroup } from '@webapp/components/form'
+import { FormItem } from '@webapp/components/form/Input'
+
 import { useIsAppSaving } from '@webapp/store/app'
 import { useAuthCanCleanseRecords } from '@webapp/store/user'
 import { useI18n } from '@webapp/store/system'
@@ -13,7 +17,7 @@ import { useButtonBar } from './store'
 import ButtonDownload from './ButtonDownload'
 import ButtonFilter from './ButtonFilter'
 import ButtonSort from './ButtonSort'
-import NodeDefLabelSwitch from '@webapp/components/survey/NodeDefLabelSwitch'
+import ButtonShowQueries from './ButtonShowQueries'
 
 const ButtonBar = (props) => {
   const {
@@ -26,71 +30,91 @@ const ButtonBar = (props) => {
     onChangeQuery,
     onNodeDefLabelTypeChange,
     setNodeDefsSelectorVisible,
+    selectedQuerySummaryUuid,
+    setSelectedQuerySummaryUuid,
   } = props
 
   const i18n = useI18n()
   const appSaving = useIsAppSaving()
   const canEdit = useAuthCanCleanseRecords()
   const modeEdit = Query.isModeRawEdit(query)
-  const modeAggregate = Query.isModeAggregate(query)
   const hasSelection = Query.hasSelection(query)
   const { Actions, state } = useButtonBar()
 
+  const queryChangeDisabled = modeEdit || !dataLoaded || dataLoading
+
   return (
     <div className="data-query-button-bar">
-      <div>
-        <button
-          type="button"
-          title={i18n.t(nodeDefsSelectorVisible ? 'dataView.nodeDefsSelector.hide' : 'dataView.nodeDefsSelector.show')}
-          className={classNames('btn', 'btn-s', { highlight: nodeDefsSelectorVisible })}
-          onClick={() => setNodeDefsSelectorVisible(!nodeDefsSelectorVisible)}
-        >
-          <span className="icon icon-tab icon-14px" />
-        </button>
+      <button
+        type="button"
+        title={i18n.t(nodeDefsSelectorVisible ? 'dataView.nodeDefsSelector.hide' : 'dataView.nodeDefsSelector.show')}
+        className={classNames('btn', 'btn-s', { highlight: nodeDefsSelectorVisible })}
+        onClick={() => setNodeDefsSelectorVisible(!nodeDefsSelectorVisible)}
+      >
+        <span className="icon icon-tab icon-14px" />
+      </button>
 
-        <button
-          type="button"
-          title={i18n.t('dataView.aggregateMode')}
-          className={classNames('btn', 'btn-s', 'btn-edit', { highlight: Query.isModeAggregate(query) })}
-          onClick={() => onChangeQuery(Query.toggleModeAggregate(query))}
-          aria-disabled={appSaving || modeEdit || !nodeDefsSelectorVisible}
-        >
-          <span className="icon icon-sigma icon-14px" />
-        </button>
-        {canEdit && hasSelection && (
-          <button
-            type="button"
-            title={i18n.t('dataView.editMode')}
-            className={classNames('btn', 'btn-s', 'btn-edit', { highlight: modeEdit })}
-            onClick={() => onChangeQuery(Query.toggleModeEdit(query))}
-            aria-disabled={appSaving || modeAggregate || dataEmpty || !dataLoaded}
-          >
-            <span className="icon icon-pencil2 icon-14px" />
-          </button>
-        )}
-      </div>
+      <FormItem className="mode-form-item" label={i18n.t('dataView.dataQuery.mode.label')}>
+        <ButtonGroup
+          disabled={appSaving || !nodeDefsSelectorVisible}
+          groupName="queryMode"
+          selectedItemKey={Query.getMode(query)}
+          onChange={(mode) => onChangeQuery(Query.assocMode(mode)(query))}
+          items={[
+            {
+              key: Query.modes.raw,
+              iconClassName: 'icon-file-text2',
+              label: 'dataView.dataQuery.mode.raw',
+            },
+            {
+              key: Query.modes.aggregate,
+              iconClassName: 'icon-sigma',
+              label: 'dataView.dataQuery.mode.aggregate',
+            },
+            ...(canEdit && hasSelection
+              ? [
+                  {
+                    key: Query.modes.rawEdit,
+                    iconClassName: 'icon-pencil2',
+                    label: 'dataView.dataQuery.mode.rawEdit',
+                    disabled: dataEmpty,
+                  },
+                ]
+              : []),
+          ]}
+        />
+      </FormItem>
 
       {hasSelection && (
         <div>
           <ButtonFilter
             query={query}
-            disabled={modeEdit || !dataLoaded || dataLoading}
+            disabled={queryChangeDisabled}
             onChangeQuery={onChangeQuery}
             state={state}
             Actions={Actions}
           />
           <ButtonSort
             query={query}
-            disabled={modeEdit || !dataLoaded || dataLoading}
+            disabled={queryChangeDisabled}
             onChangeQuery={onChangeQuery}
             state={state}
             Actions={Actions}
           />
-          <ButtonDownload query={query} disabled={modeEdit || !dataLoaded || dataLoading} />
+          <ButtonDownload query={query} disabled={queryChangeDisabled} />
         </div>
       )}
 
       <NodeDefLabelSwitch labelType={nodeDefLabelType} onChange={onNodeDefLabelTypeChange} />
+
+      <ButtonShowQueries
+        query={query}
+        onChangeQuery={onChangeQuery}
+        state={state}
+        Actions={Actions}
+        selectedQuerySummaryUuid={selectedQuerySummaryUuid}
+        setSelectedQuerySummaryUuid={setSelectedQuerySummaryUuid}
+      />
     </div>
   )
 }
diff --git a/webapp/components/DataQuery/ButtonBar/ButtonDownload/ButtonDownload.js b/webapp/components/DataQuery/ButtonBar/ButtonDownload/ButtonDownload.js
index 8bfe91ed7f..0338ba89d1 100644
--- a/webapp/components/DataQuery/ButtonBar/ButtonDownload/ButtonDownload.js
+++ b/webapp/components/DataQuery/ButtonBar/ButtonDownload/ButtonDownload.js
@@ -20,7 +20,7 @@ const ButtonDownload = (props) => {
     API.downloadDataQueryExport({ surveyId, cycle, entityDefUuid, tempFileName })
   }
 
-  return <ButtonDownloadSimple disabled={disabled} title="common.csvExport" showLabel={false} onClick={onClick} />
+  return <ButtonDownloadSimple disabled={disabled} label="common.csvExport" onClick={onClick} />
 }
 
 ButtonDownload.propTypes = {
diff --git a/webapp/components/DataQuery/ButtonBar/ButtonFilter/ButtonFilter.js b/webapp/components/DataQuery/ButtonBar/ButtonFilter/ButtonFilter.js
index c376a769e2..905cbfdd06 100644
--- a/webapp/components/DataQuery/ButtonBar/ButtonFilter/ButtonFilter.js
+++ b/webapp/components/DataQuery/ButtonBar/ButtonFilter/ButtonFilter.js
@@ -22,13 +22,14 @@ const ButtonFilter = (props) => {
   return (
     <>
       <ButtonIconFilter
-        className={`btn btn-s btn-edit${filter ? ' highlight' : ''}`}
+        className={`btn btn-edit${filter ? ' highlight' : ''}`}
         disabled={disabled}
         onClick={Actions.togglePanelFilter}
-        title={filter ? Expression.toString(filter, Expression.modes.sql) : 'dataView.filterRecords.buttonTitle'}
+        label="dataView.filterRecords.buttonTitle"
+        title={filter ? Expression.toString(filter, Expression.modes.sql) : undefined}
       />
 
-      {State.showPanelFilter(state) && (
+      {State.isPanelFilterShown(state) && (
         <ExpressionEditorPopup
           nodeDefUuidContext={entityDefUuid}
           query={filter ? Expression.toString(filter) : ''}
diff --git a/webapp/components/DataQuery/ButtonBar/ButtonShowQueries/ButtonShowQueries.js b/webapp/components/DataQuery/ButtonBar/ButtonShowQueries/ButtonShowQueries.js
new file mode 100644
index 0000000000..82a1f167ae
--- /dev/null
+++ b/webapp/components/DataQuery/ButtonBar/ButtonShowQueries/ButtonShowQueries.js
@@ -0,0 +1,49 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import classNames from 'classnames'
+
+import { Button } from '@webapp/components/buttons'
+
+import { State } from '../store'
+import DataQueriesPanel from './DataQueriesPanel'
+
+const ButtonShowQueries = (props) => {
+  const { disabled, query, onChangeQuery, state, Actions, selectedQuerySummaryUuid, setSelectedQuerySummaryUuid } =
+    props
+
+  return (
+    <>
+      <Button
+        className={classNames('btn-s', 'btn-edit')}
+        disabled={disabled}
+        iconClassName="icon-list icon-16px"
+        onClick={Actions.togglePanelQueries}
+        label="dataView.dataQuery.manageQueries"
+      />
+
+      {State.isPanelQueriesShown(state) && (
+        <DataQueriesPanel
+          query={query}
+          onChangeQuery={onChangeQuery}
+          onClose={Actions.togglePanelQueries}
+          selectedQuerySummaryUuid={selectedQuerySummaryUuid}
+          setSelectedQuerySummaryUuid={setSelectedQuerySummaryUuid}
+        />
+      )}
+    </>
+  )
+}
+
+ButtonShowQueries.propTypes = {
+  disabled: PropTypes.bool,
+  query: PropTypes.object,
+  onChangeQuery: PropTypes.func.isRequired,
+  state: PropTypes.object.isRequired,
+  Actions: PropTypes.object.isRequired,
+}
+
+ButtonShowQueries.defaultProps = {
+  disabled: false,
+}
+
+export default ButtonShowQueries
diff --git a/webapp/components/DataQuery/ButtonBar/ButtonShowQueries/DataQueriesPanel/DataQueriesPanel.js b/webapp/components/DataQuery/ButtonBar/ButtonShowQueries/DataQueriesPanel/DataQueriesPanel.js
new file mode 100644
index 0000000000..397ad82d97
--- /dev/null
+++ b/webapp/components/DataQuery/ButtonBar/ButtonShowQueries/DataQueriesPanel/DataQueriesPanel.js
@@ -0,0 +1,96 @@
+import './DataQueriesPanel.scss'
+
+import React, { useMemo } from 'react'
+
+import { DataQuerySummaries } from '@openforis/arena-core'
+
+import { Query } from '@common/model/query'
+
+import { useSurveyPreferredLang } from '@webapp/store/survey'
+import { useI18n } from '@webapp/store/system'
+
+import PanelRight from '@webapp/components/PanelRight'
+import Table from '@webapp/components/Table'
+
+import { DataQueryEditForm } from './DataQueryEditForm'
+import { useDataQueriesPanel } from './useDataQueriesPanel'
+
+const dataQueriesModuleName = 'data_queries'
+
+const DataQueriesPanel = (props) => {
+  const { onClose, onChangeQuery, query, selectedQuerySummaryUuid, setSelectedQuerySummaryUuid } = props
+
+  const {
+    draft,
+    isTableRowActive,
+    onNew,
+    onSave,
+    onDelete,
+    editedQuerySummary,
+    setEditedQuerySummary,
+    onTableRowClick,
+    queriesRequestedAt,
+    validating,
+  } = useDataQueriesPanel({
+    query,
+    onChangeQuery,
+    selectedQuerySummaryUuid,
+    setSelectedQuerySummaryUuid,
+  })
+
+  const i18n = useI18n()
+  const lang = useSurveyPreferredLang()
+
+  const columns = useMemo(
+    () => [
+      { key: 'position', header: '#', renderItem: ({ itemPosition }) => itemPosition, width: '50px' },
+      {
+        key: 'name',
+        header: 'common.name',
+        renderItem: ({ item }) => DataQuerySummaries.getName(item),
+        width: '1fr',
+      },
+      {
+        key: 'label',
+        header: 'common.label',
+        renderItem: ({ item }) => DataQuerySummaries.getLabel(lang)(item),
+        width: '1fr',
+      },
+    ],
+    [lang]
+  )
+
+  return (
+    <PanelRight
+      className="data-queries-panel"
+      onClose={onClose}
+      width="50vw"
+      header={i18n.t('dataView.dataQuery.manageQueries')}
+    >
+      {Query.hasSelection(query) && (
+        <DataQueryEditForm
+          draft={draft}
+          onDelete={onDelete}
+          onNew={onNew}
+          onSave={onSave}
+          querySummary={editedQuerySummary}
+          selectedQuerySummaryUuid={selectedQuerySummaryUuid}
+          setQuerySummary={setEditedQuerySummary}
+          validating={validating}
+        />
+      )}
+      <Table
+        className="data-queries-table"
+        columns={columns}
+        isRowActive={isTableRowActive}
+        module={dataQueriesModuleName}
+        onRowClick={onTableRowClick}
+        restParams={{ requestedAt: queriesRequestedAt }}
+        selectable
+        showFooter={false}
+      />
+    </PanelRight>
+  )
+}
+
+export default DataQueriesPanel
diff --git a/webapp/components/DataQuery/ButtonBar/ButtonShowQueries/DataQueriesPanel/DataQueriesPanel.scss b/webapp/components/DataQuery/ButtonBar/ButtonShowQueries/DataQueriesPanel/DataQueriesPanel.scss
new file mode 100644
index 0000000000..984fbe3c39
--- /dev/null
+++ b/webapp/components/DataQuery/ButtonBar/ButtonShowQueries/DataQueriesPanel/DataQueriesPanel.scss
@@ -0,0 +1,55 @@
+.data-queries-panel {
+  display: flex;
+  flex-direction: column;
+
+  .panel-right__content {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    flex: 1;
+
+    .data-query-form,
+    .data-queries-table {
+      width: 100%;
+    }
+
+    .data-query-form {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+
+      .form-item {
+        height: auto;
+      }
+
+      .form-item,
+      .labels-editor.with-label {
+        grid-template-columns: 0.3fr 0.7fr;
+        width: 100%;
+      }
+
+      .button-bar {
+        display: grid;
+        grid-template-columns: repeat(3, 1fr);
+        width: 100%;
+
+        .btn-new {
+          justify-self: start;
+        }
+
+        .btn-save {
+          justify-self: center;
+        }
+
+        .btn-delete {
+          position: inherit;
+          justify-self: end;
+        }
+      }
+    }
+
+    .data-queries-table {
+      flex: 1;
+    }
+  }
+}
diff --git a/webapp/components/DataQuery/ButtonBar/ButtonShowQueries/DataQueriesPanel/DataQueryEditForm.js b/webapp/components/DataQuery/ButtonBar/ButtonShowQueries/DataQueriesPanel/DataQueryEditForm.js
new file mode 100644
index 0000000000..0b98402dab
--- /dev/null
+++ b/webapp/components/DataQuery/ButtonBar/ButtonShowQueries/DataQueriesPanel/DataQueryEditForm.js
@@ -0,0 +1,51 @@
+import React from 'react'
+
+import { DataQuerySummaries } from '@openforis/arena-core'
+
+import * as StringUtils from '@core/stringUtils'
+import * as Validation from '@core/validation/validation'
+
+import { useI18n } from '@webapp/store/system'
+
+import { FormItem, Input } from '@webapp/components/form/Input'
+import LabelsEditor from '@webapp/components/survey/LabelsEditor'
+import { ButtonDelete, ButtonNew, ButtonSave } from '@webapp/components/buttons'
+
+export const DataQueryEditForm = (props) => {
+  const { draft, querySummary, setQuerySummary, onDelete, onNew, onSave, selectedQuerySummaryUuid, validating } = props
+
+  const i18n = useI18n()
+
+  const validation = Validation.getValidation(querySummary)
+
+  return (
+    <div className="data-query-form">
+      <FormItem label={i18n.t('common.name')}>
+        <Input
+          onChange={(value) =>
+            setQuerySummary(DataQuerySummaries.assocName(StringUtils.normalizeName(value))(querySummary))
+          }
+          validation={Validation.getFieldValidation('name')(validation)}
+          value={DataQuerySummaries.getName(querySummary)}
+        />
+      </FormItem>
+
+      <LabelsEditor
+        onChange={(labels) => setQuerySummary(DataQuerySummaries.assocLabels(labels)(querySummary))}
+        labels={DataQuerySummaries.getLabels(querySummary)}
+      />
+
+      <LabelsEditor
+        formLabelKey="common.description"
+        labels={DataQuerySummaries.getDescriptions(querySummary)}
+        onChange={(descriptions) => setQuerySummary(DataQuerySummaries.assocDescriptions(descriptions)(querySummary))}
+      />
+
+      <div className="button-bar">
+        <ButtonNew onClick={onNew} />
+        <ButtonSave disabled={!draft || validating} onClick={onSave} />
+        {selectedQuerySummaryUuid && <ButtonDelete onClick={onDelete} />}
+      </div>
+    </div>
+  )
+}
diff --git a/webapp/components/DataQuery/ButtonBar/ButtonShowQueries/DataQueriesPanel/DataQuerySummaryValidator.js b/webapp/components/DataQuery/ButtonBar/ButtonShowQueries/DataQueriesPanel/DataQuerySummaryValidator.js
new file mode 100644
index 0000000000..621ed23a65
--- /dev/null
+++ b/webapp/components/DataQuery/ButtonBar/ButtonShowQueries/DataQueriesPanel/DataQuerySummaryValidator.js
@@ -0,0 +1,14 @@
+import * as Validator from '@core/validation/validator'
+import * as Validation from '@core/validation/validation'
+
+const validate = async ({ dataQuerySummary, dataQuerySummaries }) =>
+  Validator.validate(dataQuerySummary, {
+    ['props.name']: [
+      Validator.validateRequired(Validation.messageKeys.nameRequired),
+      Validator.validateItemPropUniqueness(Validation.messageKeys.nameDuplicate)(dataQuerySummaries),
+    ],
+  })
+
+export const DataQuerySummaryValidator = {
+  validate,
+}
diff --git a/webapp/components/DataQuery/ButtonBar/ButtonShowQueries/DataQueriesPanel/index.js b/webapp/components/DataQuery/ButtonBar/ButtonShowQueries/DataQueriesPanel/index.js
new file mode 100644
index 0000000000..22e6e26850
--- /dev/null
+++ b/webapp/components/DataQuery/ButtonBar/ButtonShowQueries/DataQueriesPanel/index.js
@@ -0,0 +1 @@
+export { default } from './DataQueriesPanel'
diff --git a/webapp/components/DataQuery/ButtonBar/ButtonShowQueries/DataQueriesPanel/useDataQueriesPanel.js b/webapp/components/DataQuery/ButtonBar/ButtonShowQueries/DataQueriesPanel/useDataQueriesPanel.js
new file mode 100644
index 0000000000..206711793a
--- /dev/null
+++ b/webapp/components/DataQuery/ButtonBar/ButtonShowQueries/DataQueriesPanel/useDataQueriesPanel.js
@@ -0,0 +1,182 @@
+import { useCallback, useEffect, useState } from 'react'
+import { useDispatch } from 'react-redux'
+
+import { DataQuerySummaries, Objects } from '@openforis/arena-core'
+
+import { Query } from '@common/model/query'
+import * as Validation from '@core/validation/validation'
+
+import * as API from '@webapp/service/api'
+import { useSurveyId } from '@webapp/store/survey'
+import { DialogConfirmActions, NotificationActions } from '@webapp/store/ui'
+import { DataQuerySummaryValidator } from './DataQuerySummaryValidator'
+
+export const useDataQueriesPanel = ({
+  query,
+  onChangeQuery,
+  selectedQuerySummaryUuid,
+  setSelectedQuerySummaryUuid,
+}) => {
+  const dispatch = useDispatch()
+  const surveyId = useSurveyId()
+  const [state, setState] = useState({
+    editedQuerySummary: {},
+    fetchedQuerySummary: null,
+    dataQuerySummaries: [],
+    queriesRequestedAt: Date.now(),
+    validating: false,
+  })
+  const { editedQuerySummary, fetchedQuerySummary, dataQuerySummaries, queriesRequestedAt, validating } = state
+
+  const draft =
+    !Objects.isEqual(fetchedQuerySummary, editedQuerySummary) ||
+    !Objects.isEqual(DataQuerySummaries.getContent(editedQuerySummary), query)
+
+  const setEditedQuerySummary = useCallback(
+    async (querySummaryUpdated) => {
+      setState((statePrev) => ({ ...statePrev, editedQuerySummary: querySummaryUpdated, validating: true }))
+      const validation = await DataQuerySummaryValidator.validate({
+        dataQuerySummary: querySummaryUpdated,
+        dataQuerySummaries,
+      })
+      const querySummaryWithValidation = Validation.assocValidation(validation)(querySummaryUpdated)
+      setState((statePrev) => ({ ...statePrev, editedQuerySummary: querySummaryWithValidation, validating: false }))
+    },
+    [dataQuerySummaries]
+  )
+
+  const resetState = useCallback(() => {
+    setState((statePrev) => ({
+      ...statePrev,
+      editedQuerySummary: {},
+      fetchedQuerySummary: null,
+      queriesRequestedAt: Date.now(),
+    }))
+    setSelectedQuerySummaryUuid(null)
+  }, [setSelectedQuerySummaryUuid])
+
+  const fetchDataQuerySummaries = useCallback(async () => {
+    const dataQuerySummaries = await API.fetchDataQuerySummaries({
+      surveyId,
+      excludedUuid: selectedQuerySummaryUuid,
+    })
+    setState((statePrev) => ({ ...statePrev, dataQuerySummaries }))
+  }, [selectedQuerySummaryUuid, surveyId])
+
+  const fetchAndSetEditedQuerySummary = useCallback(
+    async ({ querySummaryUuid }) => {
+      const querySummaryFetched = await API.fetchDataQuerySummary({ surveyId, querySummaryUuid })
+      setState((statePrev) => ({
+        ...statePrev,
+        fetchedQuerySummary: querySummaryFetched,
+        editedQuerySummary: querySummaryFetched,
+      }))
+      const fetchedQuery = DataQuerySummaries.getContent(querySummaryFetched)
+      onChangeQuery(fetchedQuery)
+    },
+    [onChangeQuery, surveyId]
+  )
+
+  useEffect(() => {
+    if (selectedQuerySummaryUuid) {
+      fetchAndSetEditedQuerySummary({ querySummaryUuid: selectedQuerySummaryUuid })
+    }
+    fetchDataQuerySummaries()
+  }, [fetchAndSetEditedQuerySummary, fetchDataQuerySummaries, selectedQuerySummaryUuid])
+
+  const isTableRowActive = useCallback(
+    (row) => DataQuerySummaries.getUuid(row) === selectedQuerySummaryUuid,
+    [selectedQuerySummaryUuid]
+  )
+
+  const onNew = useCallback(() => {
+    resetState()
+  }, [resetState])
+
+  const onSave = useCallback(async () => {
+    if (validating) return
+    const validation = Validation.getValidation(editedQuerySummary)
+    if (Validation.isNotValid(validation)) {
+      dispatch(NotificationActions.notifyWarning({ key: 'common.formContainsErrorsCannotSave', timeout: 3000 }))
+      return
+    }
+    let querySummaryFetchedUpdated = null
+    if (DataQuerySummaries.getUuid(editedQuerySummary)) {
+      const querySummaryToUpdate = DataQuerySummaries.assocContent(query)(editedQuerySummary)
+      const querySummaryUpdated = await API.updateDataQuerySummary({ surveyId, querySummary: querySummaryToUpdate })
+      querySummaryFetchedUpdated = DataQuerySummaries.assocContent(query)(querySummaryUpdated)
+    } else {
+      const querySummaryToInsert = DataQuerySummaries.create({
+        content: query,
+        props: editedQuerySummary.props,
+      })
+      const insertedDataQuerySummary = await API.insertDataQuerySummary({
+        surveyId,
+        querySummary: querySummaryToInsert,
+      })
+      querySummaryFetchedUpdated = DataQuerySummaries.assocContent(query)(insertedDataQuerySummary)
+      setSelectedQuerySummaryUuid(DataQuerySummaries.getUuid(querySummaryToInsert))
+    }
+    setState((statePrev) => ({
+      ...statePrev,
+      editedQuerySummary: querySummaryFetchedUpdated,
+      fetchedQuerySummary: querySummaryFetchedUpdated,
+      queriesRequestedAt: Date.now(),
+    }))
+  }, [dispatch, editedQuerySummary, query, setSelectedQuerySummaryUuid, surveyId, validating])
+
+  const doDelete = useCallback(async () => {
+    const querySummaryUuid = DataQuerySummaries.getUuid(editedQuerySummary)
+    await API.deleteDataQuerySummary({ surveyId, querySummaryUuid })
+    resetState()
+  }, [editedQuerySummary, resetState, surveyId])
+
+  const onDelete = useCallback(() => {
+    dispatch(
+      DialogConfirmActions.showDialogConfirm({
+        key: 'dataView.dataQuery.deleteConfirmMessage',
+        params: { name: DataQuerySummaries.getName(editedQuerySummary) },
+        onOk: doDelete,
+      })
+    )
+  }, [dispatch, doDelete, editedQuerySummary])
+
+  const doQuerySummarySelection = useCallback(
+    async (selectedQuerySummary) => {
+      const querySummaryUuid = DataQuerySummaries.getUuid(selectedQuerySummary)
+      setSelectedQuerySummaryUuid(querySummaryUuid)
+      await fetchAndSetEditedQuerySummary({ querySummaryUuid })
+    },
+    [fetchAndSetEditedQuerySummary, setSelectedQuerySummaryUuid]
+  )
+
+  const onTableRowClick = useCallback(
+    async (selectedQuerySummary) => {
+      if (Query.hasSelection(query)) {
+        dispatch(
+          DialogConfirmActions.showDialogConfirm({
+            key: 'dataView.dataQuery.replaceQueryConfirmMessage',
+            params: { name: DataQuerySummaries.getName(editedQuerySummary) },
+            onOk: async () => doQuerySummarySelection(selectedQuerySummary),
+          })
+        )
+      } else {
+        await doQuerySummarySelection(selectedQuerySummary)
+      }
+    },
+    [dispatch, doQuerySummarySelection, editedQuerySummary, query]
+  )
+
+  return {
+    draft,
+    editedQuerySummary,
+    isTableRowActive,
+    onNew,
+    onSave,
+    onDelete,
+    onTableRowClick,
+    queriesRequestedAt,
+    setEditedQuerySummary,
+    validating,
+  }
+}
diff --git a/webapp/components/DataQuery/ButtonBar/ButtonShowQueries/index.js b/webapp/components/DataQuery/ButtonBar/ButtonShowQueries/index.js
new file mode 100644
index 0000000000..9dc1cee5ea
--- /dev/null
+++ b/webapp/components/DataQuery/ButtonBar/ButtonShowQueries/index.js
@@ -0,0 +1 @@
+export { default } from './ButtonShowQueries'
diff --git a/webapp/components/DataQuery/ButtonBar/ButtonSort/ButtonSort.js b/webapp/components/DataQuery/ButtonBar/ButtonSort/ButtonSort.js
index de896c35f7..c45449a386 100644
--- a/webapp/components/DataQuery/ButtonBar/ButtonSort/ButtonSort.js
+++ b/webapp/components/DataQuery/ButtonBar/ButtonSort/ButtonSort.js
@@ -25,14 +25,15 @@ const ButtonSort = (props) => {
   return (
     <>
       <Button
-        className={classNames('btn-s', 'btn-edit', { highlight: !Sort.isEmpty(sort) })}
+        className={classNames('btn-edit', { highlight: !Sort.isEmpty(sort) })}
         disabled={disabled}
         iconClassName="icon-sort-amount-asc icon-16px"
+        label="dataView.sort"
         onClick={Actions.togglePanelSort}
-        title={tooltipMessages.length > 0 ? tooltipMessages.join('\n') : 'dataView.sort'}
+        title={tooltipMessages.length > 0 ? tooltipMessages.join('\n') : undefined}
       />
 
-      {State.showPanelSort(state) && (
+      {State.isPanelSortShow(state) && (
         <SortEditor
           query={query}
           onChange={(sortUpdated) => {
diff --git a/webapp/components/DataQuery/ButtonBar/buttonBar.scss b/webapp/components/DataQuery/ButtonBar/buttonBar.scss
index f7efc26953..22000a99c8 100644
--- a/webapp/components/DataQuery/ButtonBar/buttonBar.scss
+++ b/webapp/components/DataQuery/ButtonBar/buttonBar.scss
@@ -1,28 +1,19 @@
 @import 'webapp/style/vars';
 
 .data-query-button-bar {
-  display: grid;
-  grid-template-columns: repeat(3, auto);
-  grid-column-gap: 15px;
+  display: flex;
+  flex-flow: wrap;
+  gap: 15px;
+  align-items: center;
 
-  > div {
+  .mode-form-item {
     display: flex;
-    align-items: center;
-    border: 1px solid $greyBorder;
+    width: 23rem;
   }
 
-  button,
-  a {
-    border: unset;
-    padding: 0.5rem 0.8rem;
+  button {
     &.highlight {
       background-color: $yellowHighlight;
     }
   }
 }
-
-.data-query__container.no-content .data-query-button-bar {
-  > div {
-    border-bottom: 1px solid $greyBorder;
-  }
-}
diff --git a/webapp/components/DataQuery/ButtonBar/store/state/state.js b/webapp/components/DataQuery/ButtonBar/store/state/state.js
index ab7c209adc..9577424a3f 100644
--- a/webapp/components/DataQuery/ButtonBar/store/state/state.js
+++ b/webapp/components/DataQuery/ButtonBar/store/state/state.js
@@ -5,6 +5,7 @@ const keys = {
 const keysPanels = {
   filter: 'filter',
   sort: 'sort',
+  queries: 'queries',
 }
 
 // ====== CREATE
@@ -12,13 +13,15 @@ export const create = () => ({
   [keys.panels]: {
     [keysPanels.filter]: false,
     [keysPanels.sort]: false,
+    [keysPanels.queries]: false,
   },
 })
 
 // ====== READ
-const showPanel = (panel) => (state) => state[keys.panels][panel] === true
-export const showPanelFilter = showPanel(keysPanels.filter)
-export const showPanelSort = showPanel(keysPanels.sort)
+const isPanelShown = (panel) => (state) => state[keys.panels][panel] === true
+export const isPanelFilterShown = isPanelShown(keysPanels.filter)
+export const isPanelSortShow = isPanelShown(keysPanels.sort)
+export const isPanelQueriesShown = isPanelShown(keysPanels.queries)
 
 // ====== UPDATE
 const togglePanel = (panel) => (state) => ({
@@ -29,3 +32,4 @@ const togglePanel = (panel) => (state) => ({
 })
 export const togglePanelFilter = togglePanel(keysPanels.filter)
 export const togglePanelSort = togglePanel(keysPanels.sort)
+export const togglePanelQueries = togglePanel(keysPanels.queries)
diff --git a/webapp/components/DataQuery/ButtonBar/store/useButtonBar.js b/webapp/components/DataQuery/ButtonBar/store/useButtonBar.js
index 47de1a9e03..d26f8df4cc 100644
--- a/webapp/components/DataQuery/ButtonBar/store/useButtonBar.js
+++ b/webapp/components/DataQuery/ButtonBar/store/useButtonBar.js
@@ -7,8 +7,9 @@ export const useButtonBar = () => {
 
   const Actions = {
     closePanels: () => setState(State.create()),
-    togglePanelFilter: () => setState((statePrev) => State.togglePanelFilter(statePrev)),
-    togglePanelSort: () => setState((statePrev) => State.togglePanelSort(statePrev)),
+    togglePanelFilter: () => setState(State.togglePanelFilter),
+    togglePanelSort: () => setState(State.togglePanelSort),
+    togglePanelQueries: () => setState(State.togglePanelQueries),
   }
 
   return { state, Actions }
diff --git a/webapp/components/DataQuery/DataQuery.js b/webapp/components/DataQuery/DataQuery.js
index 20a2434e6d..1555d6ac67 100644
--- a/webapp/components/DataQuery/DataQuery.js
+++ b/webapp/components/DataQuery/DataQuery.js
@@ -35,6 +35,7 @@ const DataQuery = (props) => {
   } = useDataQuery({ query })
 
   const { nodeDefLabelType, toggleLabelFunction } = useNodeDefLabelSwitch()
+  const [selectedQuerySummaryUuid, setSelectedQuerySummaryUuid] = useState(null)
 
   return (
     <div className={classNames('data-query', { 'nodedefs-selector-off': !nodeDefsSelectorVisible })}>
@@ -59,6 +60,8 @@ const DataQuery = (props) => {
             onChangeQuery={onChangeQuery}
             onNodeDefLabelTypeChange={toggleLabelFunction}
             setNodeDefsSelectorVisible={setNodeDefsSelectorVisible}
+            selectedQuerySummaryUuid={selectedQuerySummaryUuid}
+            setSelectedQuerySummaryUuid={setSelectedQuerySummaryUuid}
           />
         </div>
 
diff --git a/webapp/components/DataQuery/DataQuerySelectedAttributes/DataQuerySelectedAttributes.js b/webapp/components/DataQuery/DataQuerySelectedAttributes/DataQuerySelectedAttributes.js
index 5fd6edfe10..0adcb88d10 100644
--- a/webapp/components/DataQuery/DataQuerySelectedAttributes/DataQuerySelectedAttributes.js
+++ b/webapp/components/DataQuery/DataQuerySelectedAttributes/DataQuerySelectedAttributes.js
@@ -41,7 +41,7 @@ export const DataQuerySelectedAttributes = (props) => {
   return (
     <FormItem
       className="data-query__selected-attributes-form-item"
-      info={i18n.t('dataView.selectedAttributes.info')}
+      info="dataView.selectedAttributes.info"
       label={i18n.t('dataView.selectedAttributes.label')}
     >
       <div className="data-query__selected-attributes-wrapper" ref={containerRef}>
diff --git a/webapp/components/DataQuery/Visualizer/Table/Row/Column/store/useColumn.js b/webapp/components/DataQuery/Visualizer/Table/Row/Column/store/useColumn.js
index a4c5872ca9..d4aef2afe8 100644
--- a/webapp/components/DataQuery/Visualizer/Table/Row/Column/store/useColumn.js
+++ b/webapp/components/DataQuery/Visualizer/Table/Row/Column/store/useColumn.js
@@ -6,11 +6,10 @@ import * as NodeDefUIProps from '@webapp/components/survey/SurveyForm/nodeDefs/n
 
 export const useColumn = ({ colWidth, query, nodeDef }) => {
   const modeEdit = Query.isModeRawEdit(query)
+  const modeAggregate = Query.isModeAggregate(query)
 
-  const aggregateFunctions = Query.isModeAggregate(query)
-    ? Query.getMeasures(query).get(NodeDef.getUuid(nodeDef))
-    : null
-  const isMeasure = Boolean(aggregateFunctions)
+  const aggregateFunctions = modeAggregate ? Query.getMeasureAggregateFunctions(NodeDef.getUuid(nodeDef))(query) : null
+  const isMeasure = modeAggregate && aggregateFunctions.length > 0
   const columnNames = isMeasure
     ? // for every measure add a column for each aggregate function
       aggregateFunctions.map((aggregateFn) => ColumnNodeDef.getColumnNameAggregateFunction({ nodeDef, aggregateFn }))
diff --git a/webapp/components/DataQuery/Visualizer/Table/store/useTable.js b/webapp/components/DataQuery/Visualizer/Table/store/useTable.js
index 47e221ccf0..0f353999e6 100644
--- a/webapp/components/DataQuery/Visualizer/Table/store/useTable.js
+++ b/webapp/components/DataQuery/Visualizer/Table/store/useTable.js
@@ -15,7 +15,7 @@ export const useTable = ({ data, query, nodeDefsSelectorVisible, setData }) => {
   const [colWidth, setColWidth] = useState(null)
 
   const nodeDefColUuids = Query.isModeAggregate(query)
-    ? [...Query.getDimensions(query).values(), ...Query.getMeasures(query).keys()]
+    ? [...Query.getDimensions(query), ...Query.getMeasuresKeys(query)]
     : Query.getAttributeDefUuids(query)
   const nodeDefCols = useNodeDefsByUuids(nodeDefColUuids)
   const columnNames = nodeDefCols.flatMap(ColumnNodeDef.getColumnNames)
diff --git a/webapp/components/DataQuery/store/actions/useFetchCount.js b/webapp/components/DataQuery/store/actions/useFetchCount.js
index bbed80b837..1486d10b02 100644
--- a/webapp/components/DataQuery/store/actions/useFetchCount.js
+++ b/webapp/components/DataQuery/store/actions/useFetchCount.js
@@ -1,8 +1,6 @@
 import { useCallback } from 'react'
 import axios from 'axios'
 
-import * as A from '@core/arena'
-
 import { useSurveyCycleKey, useSurveyId } from '@webapp/store/survey'
 
 import { getUrl } from './useFetchData'
@@ -20,7 +18,7 @@ export const useFetchCount = ({ setCount }) => {
         try {
           const { data } = await axios.post(`${getUrl({ surveyId, query })}/count`, {
             cycle,
-            query: A.stringify(query),
+            query,
           })
           setCount({ data, loading: false, loaded: true })
         } catch (e) {
diff --git a/webapp/components/DataQuery/store/actions/useFetchData.js b/webapp/components/DataQuery/store/actions/useFetchData.js
index ae89412ab7..a389572b95 100644
--- a/webapp/components/DataQuery/store/actions/useFetchData.js
+++ b/webapp/components/DataQuery/store/actions/useFetchData.js
@@ -1,7 +1,6 @@
 import { useCallback } from 'react'
 import axios from 'axios'
 
-import * as A from '@core/arena'
 import { Query } from '@common/model/query'
 import { useSurveyCycleKey, useSurveyId } from '@webapp/store/survey'
 
@@ -21,7 +20,7 @@ export const useFetchData = ({ setData }) => {
         try {
           const { data } = await axios.post(getUrl({ surveyId, query }), {
             cycle,
-            query: A.stringify(query),
+            query,
             limit,
             offset,
           })
diff --git a/webapp/components/DataQuery/store/useDataQuery.js b/webapp/components/DataQuery/store/useDataQuery.js
index c21ae72424..47ecb0f4c8 100644
--- a/webapp/components/DataQuery/store/useDataQuery.js
+++ b/webapp/components/DataQuery/store/useDataQuery.js
@@ -30,7 +30,7 @@ export const useDataQuery = ({ query, limitData = true }) => {
   const attributeDefUuids = Query.getAttributeDefUuids(query)
   const dimensions = Query.getDimensions(query)
   const measures = Query.getMeasures(query)
-  const measuresAggregateFnsSize = Array.from(measures.values()).flat().length
+  const measuresAggregateFnsSize = Object.values(measures).flat().length
   const filter = Query.getFilter(query)
   const filterRecordUuid = Query.getFilterRecordUuid(query)
   const sort = Query.getSort(query)
@@ -41,9 +41,9 @@ export const useDataQuery = ({ query, limitData = true }) => {
 
   // on mount or on update offset, attributeDefUuids, dimensions, measures: fetch or reset
   useEffect(() => {
-    if (hasSelection) Actions.fetch({ offset, limit, query, includesCount: !dataLoaded })
+    if (hasSelection) Actions.fetch({ offset, limit, query })
     else Actions.reset()
-  }, [limit, offset, attributeDefUuids, dimensions, measures, measuresAggregateFnsSize, mode, sort])
+  }, [limit, offset, attributeDefUuids, dimensions, hasSelection, measures, measuresAggregateFnsSize, mode, sort])
 
   // on filter update: fetch data and count
   useOnUpdate(() => {
diff --git a/webapp/components/buttons/ButtonNew.js b/webapp/components/buttons/ButtonNew.js
index 1225ea3308..36001fbf7a 100644
--- a/webapp/components/buttons/ButtonNew.js
+++ b/webapp/components/buttons/ButtonNew.js
@@ -1,9 +1,14 @@
 import React from 'react'
+import classNames from 'classnames'
 
 import { Button } from './Button'
 
 export const ButtonNew = (props) => (
-  <Button {...props} className={`btn-primary ${props.className}`} iconClassName="icon-plus icon-12px icon-left" />
+  <Button
+    {...props}
+    className={classNames('btn-primary btn-new', props.className)}
+    iconClassName="icon-plus icon-12px icon-left"
+  />
 )
 
 ButtonNew.propTypes = {
@@ -12,5 +17,5 @@ ButtonNew.propTypes = {
 
 ButtonNew.defaultProps = {
   ...Button.defaultProps,
-  label: "common.new"
+  label: 'common.new',
 }
diff --git a/webapp/components/buttons/ButtonSave.js b/webapp/components/buttons/ButtonSave.js
index 581132ac5b..aecce6d87f 100644
--- a/webapp/components/buttons/ButtonSave.js
+++ b/webapp/components/buttons/ButtonSave.js
@@ -6,7 +6,7 @@ import { Button } from './Button'
 export const ButtonSave = (props) => (
   <Button
     {...props}
-    className={classNames('btn-primary', props.className)}
+    className={classNames('btn-primary btn-save', props.className)}
     iconClassName="icon-floppy-disk icon-12px"
   />
 )
diff --git a/webapp/components/form/buttonGroup.js b/webapp/components/form/buttonGroup.js
index 7a3e075d52..583360919c 100644
--- a/webapp/components/form/buttonGroup.js
+++ b/webapp/components/form/buttonGroup.js
@@ -4,17 +4,18 @@ import React from 'react'
 import PropTypes from 'prop-types'
 
 import * as R from 'ramda'
+import { Button } from '../buttons'
 
 const ButtonGroup = ({ items, groupName, multiple, selectedItemKey, onChange, disabled, deselectable, className }) => (
   <div className={`btn-group${className ? ` ${className}` : ''}`}>
     {items.map((item) => {
       const selected = selectedItemKey === item.key || (multiple && R.includes(item.key, selectedItemKey))
       return (
-        <button
-          data-testid={groupName ? `${groupName}_${item.key}` : null}
+        <Button
           key={item.key}
-          type="button"
-          className={`btn btn-s${selected ? ' active' : ''}${deselectable ? ' deselectable' : ''}`}
+          className={`btn-s${selected ? ' active' : ''}${deselectable ? ' deselectable' : ''}`}
+          disabled={Boolean(item.disabled) || disabled}
+          iconClassName={item.iconClassName}
           onClick={() => {
             let value
             if (multiple) {
@@ -26,10 +27,9 @@ const ButtonGroup = ({ items, groupName, multiple, selectedItemKey, onChange, di
             }
             onChange(value)
           }}
-          aria-disabled={Boolean(item.disabled) || disabled}
-        >
-          {item.label}
-        </button>
+          label={item.label}
+          testId={groupName ? `${groupName}_${item.key}` : null}
+        />
       )
     })}
   </div>
diff --git a/webapp/components/survey/NodeDefsSelector/NodeDefsSelectorAggregate.js b/webapp/components/survey/NodeDefsSelector/NodeDefsSelectorAggregate.js
index 4931532a17..ef3a804aba 100644
--- a/webapp/components/survey/NodeDefsSelector/NodeDefsSelectorAggregate.js
+++ b/webapp/components/survey/NodeDefsSelector/NodeDefsSelectorAggregate.js
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { useMemo } from 'react'
 import PropTypes from 'prop-types'
 
 import * as Survey from '@core/survey/survey'
@@ -51,10 +51,12 @@ const NodeDefsSelectorAggregate = (props) => {
 
   const variablesPrevSteps = getPrevCalculations({ nodeDefUuidEntity, survey })
 
+  const measuresNodeDefUuids = useMemo(() => Object.keys(measures), [measures])
+
   const onToggleMeasure = (nodeDefUuid) => {
-    const measuresUpdate = new Map(measures)
-    if (measuresUpdate.has(nodeDefUuid)) {
-      measuresUpdate.delete(nodeDefUuid)
+    const measuresUpdate = { ...measures }
+    if (measuresUpdate[nodeDefUuid]) {
+      delete measuresUpdate[nodeDefUuid]
     } else {
       let aggregateFn
       const variablePrevStep = variablesPrevSteps.find((variable) => StepVariable.getUuid(variable) === nodeDefUuid)
@@ -64,7 +66,7 @@ const NodeDefsSelectorAggregate = (props) => {
       } else {
         aggregateFn = Query.DEFAULT_AGGREGATE_FUNCTIONS.sum
       }
-      measuresUpdate.set(nodeDefUuid, [aggregateFn])
+      measuresUpdate[nodeDefUuid] = [aggregateFn]
     }
     onChangeMeasures(measuresUpdate)
   }
@@ -113,7 +115,7 @@ const NodeDefsSelectorAggregate = (props) => {
               filterFunction={(nodeDef) => !NodeDef.isKey(nodeDef)}
               nodeDefLabelType={nodeDefLabelType}
               nodeDefUuidEntity={nodeDefUuidEntity}
-              nodeDefUuidsAttributes={[...measures.keys()]}
+              nodeDefUuidsAttributes={measuresNodeDefUuids}
               showAncestors={false}
               showMultipleAttributes={false}
               showAnalysisAttributes={showAnalysisAttributes}
@@ -130,7 +132,7 @@ const NodeDefsSelectorAggregate = (props) => {
                     key={variableNodeDefUuid}
                     nodeDef={childDef}
                     nodeDefLabelType={nodeDefLabelType}
-                    nodeDefUuidsAttributes={[...measures.keys()]}
+                    nodeDefUuidsAttributes={measuresNodeDefUuids}
                     nodeDefContext={Survey.getNodeDefByUuid(nodeDefUuidEntity)(survey)}
                     onToggleAttribute={onToggleMeasure}
                   />
diff --git a/webapp/service/api/data/index.js b/webapp/service/api/data/index.js
index 93272b7076..07967ffbab 100644
--- a/webapp/service/api/data/index.js
+++ b/webapp/service/api/data/index.js
@@ -1,6 +1,5 @@
 import axios from 'axios'
 
-import * as A from '@core/arena'
 import { Query } from '@common/model/query'
 import { ConflictResolutionStrategy } from '@common/dataImport'
 import { objectToFormData } from '../utils/apiUtils'
@@ -99,7 +98,7 @@ export const exportDataQueryToTempFile = async ({ surveyId, cycle, query }) => {
     data: { tempFileName },
   } = await axios.post(`/api/surveyRdb/${surveyId}/${entityDefUuid}/export/start`, {
     cycle,
-    query: A.stringify(query),
+    query,
   })
   return tempFileName
 }
diff --git a/webapp/service/api/dataQuery/index.js b/webapp/service/api/dataQuery/index.js
new file mode 100644
index 0000000000..fe4f7dd60b
--- /dev/null
+++ b/webapp/service/api/dataQuery/index.js
@@ -0,0 +1,45 @@
+import axios from 'axios'
+
+import { DataQuerySummaries } from '@openforis/arena-core'
+
+const getDataQueriesEndpoint = ({ surveyId }) => `/api/survey/${surveyId}/data_queries`
+const getDataQueryEndpoint = ({ surveyId, querySummaryUuid }) =>
+  `${getDataQueriesEndpoint({ surveyId })}/${querySummaryUuid}`
+
+// CREATE
+export const insertDataQuerySummary = async ({ surveyId, querySummary }) => {
+  const querySummaryUuid = DataQuerySummaries.getUuid(querySummary)
+  const url = getDataQueryEndpoint({ surveyId, querySummaryUuid })
+  const { data: querySummaryInserted } = await axios.post(url, querySummary)
+  return querySummaryInserted
+}
+
+// READ
+export const fetchDataQuerySummary = async ({ surveyId, querySummaryUuid }) => {
+  const url = getDataQueryEndpoint({ surveyId, querySummaryUuid })
+  const { data: querySummaryFetched } = await axios.get(url)
+  return querySummaryFetched
+}
+
+export const fetchDataQuerySummaries = async ({ surveyId }) => {
+  const url = getDataQueriesEndpoint({ surveyId })
+  const {
+    data: { list },
+  } = await axios.get(url)
+  return list
+}
+
+// UPDATE
+export const updateDataQuerySummary = async ({ surveyId, querySummary }) => {
+  const querySummaryUuid = DataQuerySummaries.getUuid(querySummary)
+  const url = getDataQueryEndpoint({ surveyId, querySummaryUuid })
+  const { data: querySummaryUpdated } = await axios.put(url, querySummary)
+  return querySummaryUpdated
+}
+
+// DELETE
+export const deleteDataQuerySummary = async ({ surveyId, querySummaryUuid }) => {
+  const url = getDataQueryEndpoint({ surveyId, querySummaryUuid })
+  const { data: querySummaryDeleted } = await axios.delete(url)
+  return querySummaryDeleted
+}
diff --git a/webapp/service/api/index.js b/webapp/service/api/index.js
index 6607b5fb9f..46b0ef5800 100644
--- a/webapp/service/api/index.js
+++ b/webapp/service/api/index.js
@@ -45,6 +45,13 @@ export {
   downloadExportedDataToCSVUrl,
   startRecordsCloneJob,
 } from './data'
+export {
+  insertDataQuerySummary,
+  fetchDataQuerySummary,
+  fetchDataQuerySummaries,
+  updateDataQuerySummary,
+  deleteDataQuerySummary,
+} from './dataQuery'
 export { fetchAvailableMapPeriods, fetchAltitude, testMapApiKey, fetchMapWmtsCapabilities } from './map'
 export {
   fetchSurveyFull,
diff --git a/webapp/style/table.scss b/webapp/style/table.scss
index c773554a57..522911fd7d 100644
--- a/webapp/style/table.scss
+++ b/webapp/style/table.scss
@@ -13,7 +13,7 @@ $tableFooterHeight: 30px;
   display: flex;
   align-items: center;
   justify-content: space-between;
-  height: $tableHeaderHeight;
+  min-height: $tableHeaderHeight;
 }
 
 .table__content {
diff --git a/yarn.lock b/yarn.lock
index ade4414894..493478b40a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2765,10 +2765,10 @@
     mkdirp "^1.0.4"
     rimraf "^3.0.2"
 
-"@openforis/arena-core@^0.0.174":
-  version "0.0.174"
-  resolved "https://npm.pkg.github.com/download/@openforis/arena-core/0.0.174/0dab03cf5567202a785fb42bca367a46789919ae#0dab03cf5567202a785fb42bca367a46789919ae"
-  integrity sha512-aQDqspdFuw2aTP0guFQJXcepCZ4Q15vD+3sHDMZin50E1MTtjqkbHbKtHvhPvK2k98A1h6el+w742I7mUBUc4Q==
+"@openforis/arena-core@^0.0.188":
+  version "0.0.188"
+  resolved "https://npm.pkg.github.com/download/@openforis/arena-core/0.0.188/ff79e8e185b69aa124595de65c56b16161878f49#ff79e8e185b69aa124595de65c56b16161878f49"
+  integrity sha512-BiYLoBpaEIbw5R6XJpxiYMjBl5biGLuj15lHyFj0egxWPpXaGuj0rJl1EHpk9DWwPDBKo21vGpuoxZQAjOHKJQ==
   dependencies:
     "@jsep-plugin/regex" "^1.0.3"
     bignumber.js "^9.1.2"
@@ -2778,32 +2778,16 @@
     lodash.frompairs "^4.0.1"
     lodash.isequal "^4.5.0"
     lodash.topairs "^4.3.0"
-    proj4 "^2.9.0"
+    proj4 "^2.11.0"
     uuid "^9.0.1"
 
-"@openforis/arena-core@^0.0.183":
-  version "0.0.183"
-  resolved "https://npm.pkg.github.com/download/@openforis/arena-core/0.0.183/09804e975b19f48337f0c9f705f1606016678e48#09804e975b19f48337f0c9f705f1606016678e48"
-  integrity sha512-eKsk8XZmS9GAqCKgbPrYAkxmPmdmnYoVdV+E2rMvTTTNUWgCxadFj+pDheb1Ux+z1eSPuTZ0dJN9QfvqDLG0hQ==
-  dependencies:
-    "@jsep-plugin/regex" "^1.0.3"
-    bignumber.js "^9.1.2"
-    date-fns "^2.30.0"
-    jsep "^1.3.8"
-    lodash.differencewith "^4.5.0"
-    lodash.frompairs "^4.0.1"
-    lodash.isequal "^4.5.0"
-    lodash.topairs "^4.3.0"
-    proj4 "^2.9.0"
-    uuid "^9.0.1"
-
-"@openforis/arena-server@^0.1.31":
-  version "0.1.31"
-  resolved "https://npm.pkg.github.com/download/@openforis/arena-server/0.1.31/e0cae5f6f93b1c474004af52da06b5091f9b05cb#e0cae5f6f93b1c474004af52da06b5091f9b05cb"
-  integrity sha512-XrWRjiUSOSFUslDbR3w+ZFAcOi5aPgqOaG82nvgaIQ3Ncc90ZdMxFxZj/g1E+ZZT7dbBuPDoPQWMIWgDqAvIIA==
+"@openforis/arena-server@^0.1.32":
+  version "0.1.32"
+  resolved "https://npm.pkg.github.com/download/@openforis/arena-server/0.1.32/58dc1a4ac098ea4f46a023db7f3a020e98db2221#58dc1a4ac098ea4f46a023db7f3a020e98db2221"
+  integrity sha512-y5q3gwrL5OhBkuA/82NRxIUbw0WZmlT07hiWyZQRPVrQE8edyNrvxaK74FNfpUmioS91miWu7FVoZ0Tu4SUqKQ==
   dependencies:
     "@godaddy/terminus" "^4.12.1"
-    "@openforis/arena-core" "^0.0.174"
+    "@openforis/arena-core" "^0.0.188"
     bcryptjs "^2.4.3"
     body-parser "^1.20.2"
     compression "^1.7.4"
@@ -12017,7 +12001,7 @@ process@^0.11.1:
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
 
-proj4@^2.1.4, proj4@^2.9.0:
+proj4@^2.1.4:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/proj4/-/proj4-2.9.0.tgz#1b61db8c998313f80e2514609b339fb2d28cbb82"
   integrity sha512-BoDXEzCVnRJVZoOKA0QHTFtYoE8lUxtX1jST38DJ8U+v1ixY70Kpwi0Llu6YqSWEH2xqu4XMEBNGcgeRIEywoA==
@@ -12025,6 +12009,14 @@ proj4@^2.1.4, proj4@^2.9.0:
     mgrs "1.0.0"
     wkt-parser "^1.3.1"
 
+proj4@^2.11.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/proj4/-/proj4-2.11.0.tgz#795a5790aed30a7535d6a4c5775c0ce2a763cc41"
+  integrity sha512-SasuTkAx8HnWQHfIyhkdUNJorSJqINHAN3EyMWYiQRVorftz9DHz650YraFgczwgtHOxqnfuDxSNv3C8MUnHeg==
+  dependencies:
+    mgrs "1.0.0"
+    wkt-parser "^1.3.3"
+
 promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
@@ -15411,7 +15403,7 @@ winston@2.x:
     isstream "0.1.x"
     stack-trace "0.0.x"
 
-wkt-parser@^1.3.1:
+wkt-parser@^1.3.1, wkt-parser@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/wkt-parser/-/wkt-parser-1.3.3.tgz#46b4e3032dd9c86907f7e630b57e3c6ea2bb772b"
   integrity sha512-ZnV3yH8/k58ZPACOXeiHaMuXIiaTk1t0hSUVisbO0t4RjA5wPpUytcxeyiN2h+LZRrmuHIh/1UlrR9e7DHDvTw==