diff --git a/packages/app/package.json b/packages/app/package.json
index 505416b60a..6da8440abe 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -12,7 +12,7 @@
         "redux-mock-store": "^1.5.3"
     },
     "dependencies": {
-        "@dhis2/analytics": "^2.6.13",
+        "@dhis2/analytics": "^2.6.16",
         "@dhis2/d2-ui-core": "^6.2.1",
         "@dhis2/d2-ui-file-menu": "^6.2.1",
         "@dhis2/d2-ui-interpretations": "^6.2.1",
diff --git a/packages/app/src/modules/layout.js b/packages/app/src/modules/layout.js
index 4c9fa1f45f..b0b7c04346 100644
--- a/packages/app/src/modules/layout.js
+++ b/packages/app/src/modules/layout.js
@@ -4,6 +4,7 @@ import {
     AXIS_ID_ROWS,
     AXIS_ID_FILTERS,
     getAxisMaxNumberOfDimensions,
+    getAvailableAxes,
 } from '@dhis2/analytics'
 
 // Names for dnd sources
@@ -72,6 +73,10 @@ export const getRetransfer = (layout, transfer, visType) => {
 
         if (axisIsFull) {
             retransfer[dimensionsAtDestination[0]] = sourceAxis
+                ? sourceAxis
+                : getAvailableAxes(visType).find(
+                      axis => !getAxisMaxNumberOfDimensions(visType, axis)
+                  )
         }
     })
 
diff --git a/packages/app/src/reducers/__tests__/ui.spec.js b/packages/app/src/reducers/__tests__/ui.spec.js
index 784fd6a8ba..a9c710390b 100644
--- a/packages/app/src/reducers/__tests__/ui.spec.js
+++ b/packages/app/src/reducers/__tests__/ui.spec.js
@@ -203,7 +203,7 @@ describe('reducer: ui', () => {
             layout: {
                 columns: [otherId],
                 rows: [DIMENSION_ID_PERIOD],
-                filters: [DIMENSION_ID_ORGUNIT],
+                filters: [DIMENSION_ID_ORGUNIT, DIMENSION_ID_DATA],
             },
         }
 
diff --git a/packages/app/src/reducers/ui.js b/packages/app/src/reducers/ui.js
index a6bf0ddc95..334893a140 100644
--- a/packages/app/src/reducers/ui.js
+++ b/packages/app/src/reducers/ui.js
@@ -98,7 +98,7 @@ export default (state = DEFAULT_UI, action) => {
                 ...getRetransfer(state.layout, action.value, state.type),
             }
 
-            // Filter out transfered dimension ids (remove from source)
+            // Filter out transferred dimension ids (remove from source)
             const newLayout = getFilteredLayout(
                 state.layout,
                 Object.keys(transfers)
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
index fd4cf3d705..cc88d3af1c 100644
--- a/packages/plugin/package.json
+++ b/packages/plugin/package.json
@@ -6,7 +6,7 @@
     "module": "./build/es/lib.js",
     "license": "BSD-3-Clause",
     "dependencies": {
-        "@dhis2/analytics": "^2.6.13",
+        "@dhis2/analytics": "^2.6.16",
         "@material-ui/core": "^3.1.2",
         "lodash-es": "^4.17.11",
         "react": "^16.6.0",
diff --git a/yarn.lock b/yarn.lock
index 21f8d088ab..bb7456d23c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -965,10 +965,10 @@
     react-beautiful-dnd "^10.1.1"
     styled-jsx "^3.2.1"
 
-"@dhis2/analytics@^2.6.13":
-  version "2.6.13"
-  resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-2.6.13.tgz#d01a3d95fb642d51cafec0e0f9b2b6647b38d39b"
-  integrity sha512-TWcmc0B+PUdAkwWB74smElo1j/6ATXtDsuHegtSjxB77vJXF2pTMyYhN8GmVWFBeC54cu/srCcuR1eHDDHL0KQ==
+"@dhis2/analytics@^2.6.16":
+  version "2.6.16"
+  resolved "https://registry.yarnpkg.com/@dhis2/analytics/-/analytics-2.6.16.tgz#65a73f7f9a56afbad811522c0d5bc12450aa78be"
+  integrity sha512-ADv2WvUYGIN1pDOZlj+Dz4UTtSdgqPdQkkj35+snpWNPPeIEDn46vbY8eb/jkkgKdEljem9zC0Vxj1uKHtFBQQ==
   dependencies:
     "@dhis2/d2-i18n" "^1.0.4"
     "@dhis2/d2-ui-org-unit-dialog" "^6.3.0"