diff --git a/core/modules/tracker/lib/Drupal/tracker/Plugin/views/argument/TrackerCommentUserUid.php b/core/modules/tracker/lib/Drupal/tracker/Plugin/views/argument/TrackerCommentUserUid.php
index 5e23054..a6c03e6 100644
--- a/core/modules/tracker/lib/Drupal/tracker/Plugin/views/argument/TrackerCommentUserUid.php
+++ b/core/modules/tracker/lib/Drupal/tracker/Plugin/views/argument/TrackerCommentUserUid.php
@@ -16,7 +16,8 @@
  * @ingroup views_argument_handlers
  *
  * @Plugin(
- *   id = "tracker_comment_user_uid"
+ *   id = "tracker_comment_user_uid",
+ *   module = "tracker"
  * )
  */
 class TrackerCommentUserUid extends UserUid {
diff --git a/core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/TrackerCommentUserUid.php b/core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/TrackerCommentUserUid.php
index 2805caf..456982c 100644
--- a/core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/TrackerCommentUserUid.php
+++ b/core/modules/tracker/lib/Drupal/tracker/Plugin/views/filter/TrackerCommentUserUid.php
@@ -16,7 +16,8 @@
  * @ingroup views_filter_handlers
  *
  * @Plugin(
- *   id = "tracker_comment_user_uid"
+ *   id = "tracker_comment_user_uid",
+ *   module = "tracker"
  * )
  */
 class TrackerCommentUserUid extends UserUid {
diff --git a/core/modules/tracker/tracker.views.inc b/core/modules/tracker/tracker.views.inc
index 23ab7c4..af481d0 100644
--- a/core/modules/tracker/tracker.views.inc
+++ b/core/modules/tracker/tracker.views.inc
@@ -2,13 +2,13 @@
 
 /**
  * @file
- * Provide views data and handlers for tracker.module.
+ * Provide views data for tracker.module.
  *
  * @ingroup views_module_handlers
  */
 
 /**
- * Implementation of hook_views_data().
+ * Implements of hook_views_data().
  */
 function tracker_views_data() {
   $data = array();
@@ -26,7 +26,6 @@ function tracker_views_data() {
     'help' => t('The node ID of the node.'),
     'field' => array(
       'id' => 'node',
-      'click sortable' => TRUE,
     ),
     'argument' => array(
       'id' => 'node_nid',
@@ -46,7 +45,6 @@ function tracker_views_data() {
     'help' => t('The date the node was last updated.'),
     'field' => array(
       'id' => 'date',
-      'click sortable' => TRUE,
     ),
     'sort' => array(
       'id' => 'date',
@@ -60,12 +58,13 @@ function tracker_views_data() {
     'help' => t('Whether or not the node is published.'),
     'field' => array(
       'id' => 'boolean',
-      'click sortable' => TRUE,
     ),
     'filter' => array(
-      'id' => 'tracker_boolean',
+      'id' => 'boolean',
       'label' => t('Published'),
       'type' => 'yes-no',
+      'accept null' => TRUE,
+      'use_equal' => TRUE,
     ),
     'sort' => array(
       'id' => 'standard',
@@ -90,7 +89,6 @@ function tracker_views_data() {
     'help' => t('The node ID of the node a user created or commented on. You must use an argument or filter on UID or you will get misleading results using this field.'),
     'field' => array(
       'id' => 'node',
-      'click sortable' => TRUE,
     ),
     'argument' => array(
       'id' => 'node_nid',
@@ -110,7 +108,6 @@ function tracker_views_data() {
     'help' => t('The user ID of a user who touched the node (either created or commented on it).'),
     'field' => array(
       'id' => 'user_name',
-      'click sortable' => TRUE,
     ),
     'argument' => array(
       'id' => 'user_uid',
@@ -129,7 +126,6 @@ function tracker_views_data() {
     'help' => t('The date the node was last updated or commented on. You must use an argument or filter on UID or you will get misleading results using this field.'),
     'field' => array(
       'id' => 'date',
-      'click sortable' => TRUE,
     ),
     'sort' => array(
       'id' => 'date',
@@ -143,12 +139,13 @@ function tracker_views_data() {
     'help' => t('Whether or not the node is published. You must use an argument or filter on UID or you will get misleading results using this field.'),
     'field' => array(
       'id' => 'boolean',
-      'click sortable' => TRUE,
     ),
     'filter' => array(
       'id' => 'boolean',
       'label' => t('Published'),
       'type' => 'yes-no',
+      'accept null' => TRUE,
+      'use_equal' => TRUE,
     ),
     'sort' => array(
       'id' => 'standard',