diff --git a/core/modules/aggregator/aggregator.views.inc b/core/modules/aggregator/aggregator.views.inc
index ade6f50..35e9611 100644
--- a/core/modules/aggregator/aggregator.views.inc
+++ b/core/modules/aggregator/aggregator.views.inc
@@ -13,7 +13,7 @@
 function aggregator_views_data() {
   $data = array();
 
-  $data['aggregator_item']['table']['group']  = t('Aggregator');
+  $data['aggregator_item']['table']['group'] = t('Aggregator');
 
   $data['aggregator_item']['table']['base'] = array(
     'field' => 'iid',
@@ -95,9 +95,6 @@ function aggregator_views_data() {
     'filter' => array(
       'id' => 'string',
     ),
-    'argument' => array(
-      'id' => 'string',
-    ),
   );
 
   $data['aggregator_item']['guid'] = array(
@@ -116,9 +113,6 @@ function aggregator_views_data() {
     'filter' => array(
       'id' => 'string',
     ),
-    'argument' => array(
-      'id' => 'string',
-    ),
   );
 
   $data['aggregator_item']['description'] = array(
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/CategoryCid.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/CategoryCid.php
index fed109c..ec878e7 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/CategoryCid.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/argument/CategoryCid.php
@@ -28,7 +28,7 @@ class CategoryCid extends Numeric {
   function title_query() {
     $titles = array();
 
-    $result = db_query("SELECT title FROM {aggregator_category} where cid IN (:cid)", array(':cid' => $this->value))->fetchAssoc();
+    $result = db_query("SELECT title FROM {aggregator_category} where cid IN (:cid)", array(':cid' => $this->value))->fetchCol();
     foreach ($result as $category) {
       $titles[] = check_plain($category->title);
     }
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Category.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Category.php
index 083a98e..9972d03 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Category.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/field/Category.php
@@ -65,7 +65,7 @@ function render_link($data, $values) {
     $cid = $this->get_value($values, 'cid');
     if (!empty($this->options['link_to_category']) && !empty($cid) && $data !== NULL && $data !== '') {
       $this->options['alter']['make_link'] = TRUE;
-      $this->options['alter']['path'] = "aggregator/category/$cid";
+      $this->options['alter']['path'] = "aggregator/categories/$cid";
     }
     return $data;
   }
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/filter/CategoryCid.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/filter/CategoryCid.php
index e9f2894..4c343c2 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/filter/CategoryCid.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/views/filter/CategoryCid.php
@@ -31,10 +31,7 @@ function get_value_options() {
     }
 
     $this->value_options = array();
-    $result = db_query('SELECT * FROM {aggregator_category} ORDER BY title');
-    foreach ($result as $category) {
-      $this->value_options[$category->cid] = $category->title;
-    }
+    $this->value_options = db_query('SELECT cid, title FROM {aggregator_category} ORDER BY title')->fetchAllKeyed();
   }
 
 }