diff --git a/CHANGELOG.md b/CHANGELOG.md
index caa2b2ebc0f160e5f21bcdf3df085a903cf567ba..8da1e313cb09459bd8198af30c5b1525f07b501d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ This is a changelog for Piwik platform developers. All changes for our HTTP API'
 * The method `Piwik\Plugin\Menu::configureReportingMenu` has been removed. To add something to the reporting menu you need to create widgets
 * The method `Report::configureWidget()`, `Report::getWidgetTitle()` and `Report::configureReportingMenu()` have been removed, use the new method `Report::configureWidgets()` instead.
 * The method `Report::getCategory()` does no longer return the translated category but the translation key of the category
+* The property `Report::$category` has been renamed to `Report::$categoryId`
 * The methods `Report::factory()`, `Report::getAllReportClasses()`, `Report::getAllReports` have been moved to the `Piwik\Plugin\Reports` class.
 * The properties `Report::$widgetTitle`, `Report::$widgetParams` and `Report::$menuTitle` were removed, use the method `Report::configureWidgets()` to create widgets instead
 * In the HTTP API methods `Dashboard.getDefaultDashboard` and `Dashboard.getUserDashboards` we do no longer remove not existing widgets as it is up to the client which widgets actually exist
diff --git a/plugins/CoreHome/angularjs/reporting-menu/reportingmenu.controller.js b/plugins/CoreHome/angularjs/reporting-menu/reportingmenu.controller.js
index 85dc0f17c5d7d8f26eccac269b88510e7ee26d67..6e3a21e8516afa6d2502d3f02d18a45069b0f755 100644
--- a/plugins/CoreHome/angularjs/reporting-menu/reportingmenu.controller.js
+++ b/plugins/CoreHome/angularjs/reporting-menu/reportingmenu.controller.js
@@ -86,7 +86,13 @@
         var segment = getUrlParam('segment');
 
         $scope.makeUrl = function (category, subcategory) {
-            var url = 'idSite=' + idSite + '&period=' + period + '&date=' + date + '&category=' + category.id + '&subcategory=' + subcategory.id;
+
+            var url = 'idSite=' + encodeURIComponent(idSite);
+            url    += '&period=' + encodeURIComponent(period);
+            url    += '&date=' + encodeURIComponent(date);
+            url    += '&category=' + encodeURIComponent(category.id);
+            url    += '&subcategory=' + encodeURIComponent(subcategory.id);
+
             if (segment) {
                 url+= '&segment='+ segment;
             }