diff --git a/library/Icinga/Repository/Repository.php b/library/Icinga/Repository/Repository.php
index 7568a17f6e..d615fd1491 100644
--- a/library/Icinga/Repository/Repository.php
+++ b/library/Icinga/Repository/Repository.php
@@ -653,7 +653,15 @@ public function requireAllQueryColumns($table)
             throw new ProgrammingError('Table name "%s" not found', $table);
         }
 
-        return $queryColumns[$table];
+        $filterColumns = $this->getFilterColumns();
+        $columns = array();
+        foreach ($queryColumns[$table] as $alias => $column) {
+            if (! in_array(is_string($alias) ? $alias : $column, $filterColumns)) {
+                $columns[$alias] = $column;
+            }
+        }
+
+        return $columns;
     }
 
     /**