diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php
index 58fe8027..d1002051 100644
--- a/application/controllers/DashboardController.php
+++ b/application/controllers/DashboardController.php
@@ -35,7 +35,14 @@ class DashboardController extends ActionController
             $this->setAutorefreshInterval(10);
         }
 
-        $mainDashboards = ['Objects', 'Alerts', 'Automation', 'Deployment', 'Director', 'Data'];
+        $mainDashboards = [
+            'Objects',
+            'Alerts',
+            'Automation',
+            'Deployment',
+            'Director',
+            'Data',
+        ];
         $this->setTitle($this->translate('Icinga Director - Main Dashboard'));
         $names = $this->params->getValues('name', $mainDashboards);
         if (! $this->params->has('name')) {
diff --git a/library/Director/Data/Db/IcingaObjectFilterRenderer.php b/library/Director/Data/Db/IcingaObjectFilterRenderer.php
index f5b51109..de2ec79a 100644
--- a/library/Director/Data/Db/IcingaObjectFilterRenderer.php
+++ b/library/Director/Data/Db/IcingaObjectFilterRenderer.php
@@ -15,10 +15,10 @@ class IcingaObjectFilterRenderer
     /** @var IcingaObjectQuery */
     protected $query;
 
-    protected $columnMap = array(
+    protected $columnMap = [
         'host.name' => 'host.object_name',
         'service.name' => 'service.object_name',
-    );
+    ];
 
     public function __construct(Filter $filter, IcingaObjectQuery $query)
     {
diff --git a/library/Director/Data/Db/IcingaObjectQuery.php b/library/Director/Data/Db/IcingaObjectQuery.php
index 8bd58a82..b9387ef0 100644
--- a/library/Director/Data/Db/IcingaObjectQuery.php
+++ b/library/Director/Data/Db/IcingaObjectQuery.php
@@ -70,7 +70,7 @@ class IcingaObjectQuery
         if (! $this->hasJoinedVar($name)) {
             $type = $this->type;
             $alias = $this->safeVarAlias($name);
-            $varAlias = $alias . '_v';
+            $varAlias = "v_$alias";
             // TODO: optionally $varRelation = sprintf('icinga_%s_resolved_var', $type);
             $varRelation = sprintf('icinga_%s_var', $type);
             $idCol = sprintf('%s.%s_id', $alias, $type);
@@ -97,6 +97,12 @@ class IcingaObjectQuery
         return $this;
     }
 
+    // Debug only
+    public function getSql()
+    {
+        return (string) $this->baseQuery;
+    }
+
     public function listNames()
     {
         return $this->db->fetchCol(
@@ -141,7 +147,6 @@ class IcingaObjectQuery
      */
     public function getAliasForRequiredFilterColumn($column)
     {
-        $dot = strpos($column, '.');
         list($key, $sub) = $this->splitFilterKey($column);
         if ($sub === null) {
             return $key;
@@ -169,9 +174,9 @@ class IcingaObjectQuery
     {
         $dot = strpos($key, '.');
         if ($dot === false) {
-            return array($key, null);
+            return [$key, null];
         } else {
-            return array(substr($key, 0, $dot), substr($key, $dot + 1));
+            return [substr($key, 0, $dot), substr($key, $dot + 1)];
         }
     }
 
diff --git a/library/Director/Objects/IcingaFlatVar.php b/library/Director/Objects/IcingaFlatVar.php
index fe1a192d..3bbf81c8 100644
--- a/library/Director/Objects/IcingaFlatVar.php
+++ b/library/Director/Objects/IcingaFlatVar.php
@@ -10,10 +10,10 @@ class IcingaFlatVar extends DbObject
 {
     protected $table = 'icinga_flat_var';
 
-    protected $keyName = array(
-        'checksum',
+    protected $keyName = [
+        'var_checksum',
         'flatname_checksum'
-    );
+    ];
 
     protected $defaultProperties = [
         'var_checksum'      => null,
@@ -39,18 +39,18 @@ class IcingaFlatVar extends DbObject
 
     public static function forCustomVar(CustomVariable $var, Db $db)
     {
-        $flat = array();
+        $flat = [];
         $varSum = $var->checksum();
         $var->flatten($flat, $var->getKey());
-        $flatVars = array();
+        $flatVars = [];
 
         foreach ($flat as $name => $value) {
-            $flatVar = static::create(array(
+            $flatVar = static::create([
                 'var_checksum'      => $varSum,
                 'flatname_checksum' => sha1($name, true),
                 'flatname'          => $name,
                 'flatvalue'         => $value,
-            ), $db);
+            ], $db);
 
             $flatVar->store();
             $flatVars[] = $flatVar;
diff --git a/library/Director/Objects/IcingaVar.php b/library/Director/Objects/IcingaVar.php
index 1539d7c8..10addf2f 100644
--- a/library/Director/Objects/IcingaVar.php
+++ b/library/Director/Objects/IcingaVar.php
@@ -29,7 +29,7 @@ class IcingaVar extends DbObject
     ];
 
     /**
-     * @param CustomVariable $var
+     * @param CustomVariable $customVar
      * @param Db $db
      *
      * @return static