diff --git a/fbsmp.views.inc b/fbsmp.views.inc
index e03ef6e..5cd573c 100644
--- a/fbsmp.views.inc
+++ b/fbsmp.views.inc
@@ -62,7 +62,7 @@ function fbsmp_views_data() {
 
   $data['fbsmp']['empty_status_attachment'] = array(
     'title' => t('Do not show empty status'),
-    'help' => t('Do not show a status without a status text and attachment'),
+    'help' => t('Do not show a status without a status text or attachment'),
     'filter' => array(
       'field' => 'data',
       'handler' => 'fbsmp_views_handler_filter_empty_status_attachment',
@@ -72,22 +72,3 @@ function fbsmp_views_data() {
   return $data;
 
 }
-
-/**
- * Implements hook_views_handlers().
- */
-function fbsmp_views_handlers() {
-  return array(
-    'info' => array(
-      'path' => drupal_get_path('module', 'fbsmp'),
-    ),
-    'handlers' => array(
-      'fbsmp_views_handler_field_themed_attachment' => array(
-        'parent' => 'views_handler_field',
-      ),
-      'fbsmp_views_handler_filter_empty_status_attachment' => array(
-        'parent' => 'views_handler_filter_boolean_operator',
-      ),
-    ),
-  );
-}
diff --git a/fbsmp_views_handler_filter_empty_status_attachment.inc b/fbsmp_views_handler_filter_empty_status_attachment.inc
index a3de27f..9abd098 100644
--- a/fbsmp_views_handler_filter_empty_status_attachment.inc
+++ b/fbsmp_views_handler_filter_empty_status_attachment.inc
@@ -6,7 +6,7 @@
  */
 
 /**
- * Filter handler to show status with at least one of status text and attachment.
+ * Filter handler to show status with at least one of status text or attachment.
  */
 class fbsmp_views_handler_filter_empty_status_attachment extends views_handler_filter_boolean_operator {
   function construct() {
@@ -19,15 +19,20 @@ class fbsmp_views_handler_filter_empty_status_attachment extends views_handler_f
   function query() {
     if ($this->value) {
       $table = $this->ensure_my_table();
-      $fbss = $this->query->ensure_table('facebook_status');
-      $query = "$fbss.message <> ''";
+      $status_alias = $this->query->ensure_table('statuses');
 
       $plugins = fbsmp_get_plugins();
       if (is_array($plugins) && count($plugins) > 0) {
-        $query .= " OR ( $table.type IS NOT NULL AND $table.type IN (:plugins) )";
+        $db_or = db_or()
+          ->condition("$status_alias.message", '', '<>')
+          ->condition(db_and()
+            ->isNotNull("$table.type")
+            ->condition("$table.type", array_keys($plugins), 'IN'));
+        $this->query->add_where(0, $db_or);
+      }
+      else {
+        $this->query->add_where(0, "$status_alias.message", '', '<>');
       }
-
-      $this->query->add_where(0, $query, array(':plugins' => array_keys($plugins)));
     }
   }
 }