1 files changed, 6 insertions, 5 deletions
diff --git a/core/API/DataTableManipulator.php b/core/API/DataTableManipulator.php
index 7dad3b7a0d..e9140fecf6 100644
--- a/core/API/DataTableManipulator.php
+++ b/core/API/DataTableManipulator.php
@@ -10,6 +10,7 @@ namespace Piwik\API;
 
 use Exception;
 use Piwik\Archive\DataTableFactory;
+use Piwik\Container\StaticContainer;
 use Piwik\DataTable\Row;
 use Piwik\DataTable;
 use Piwik\Period\Range;
@@ -153,11 +154,11 @@ abstract class DataTableManipulator
             }
 
             $apiParameters = array();
-            if (!empty($request['idDimension'])) {
-                $apiParameters['idDimension'] = $request['idDimension'];
-            }
-            if (!empty($request['idGoal'])) {
-                $apiParameters['idGoal'] = $request['idGoal'];
+            $entityNames = StaticContainer::get('entities.idNames');
+            foreach ($entityNames as $idName) {
+                if (!empty($request[$idName])) {
+                    $apiParameters[$idName] = $request[$idName];
+                }
             }
 
             $meta = API::getInstance()->getMetadata($idSite, $this->apiModule, $this->apiMethod, $apiParameters);