diff --git a/lib/sqlparser/vendor/phpmyadmin/sql-parser/src/Components/Condition.php b/lib/sqlparser/vendor/phpmyadmin/sql-parser/src/Components/Condition.php
index 700b071ef2..cbb029ac22 100644
--- a/lib/sqlparser/vendor/phpmyadmin/sql-parser/src/Components/Condition.php
+++ b/lib/sqlparser/vendor/phpmyadmin/sql-parser/src/Components/Condition.php
@@ -87,7 +87,7 @@ class Condition extends Component
      */
     public function __construct($expr = null)
     {
-        $this->expr = trim($expr);
+        $this->expr = !empty($expr) ? trim($expr) : $expr;
     }
 
     /**
diff --git a/module/dataview/table/effort.php b/module/dataview/table/effort.php
index ae789aa3e0..d6c2c80982 100644
--- a/module/dataview/table/effort.php
+++ b/module/dataview/table/effort.php
@@ -1,5 +1,5 @@
 <?php
-$this->app->loadLang('account');
+$this->app->loadLang('user');
 
 $schema = new stdclass();
 
@@ -9,6 +9,6 @@ $schema->tables = array();
 $schema->tables['effort'] = 'zt_effort';
 
 $schema->fields = array();
-$schema->fields['id']      = array('type' => 'number', 'name' => $this->lang->account->id);
-$schema->fields['account'] = array('type' => 'user',   'name' => $this->lang->account->name);
+$schema->fields['id']      = array('type' => 'number', 'name' => $this->lang->user->id);
+$schema->fields['account'] = array('type' => 'user',   'name' => $this->lang->user->account);
 
diff --git a/module/dataview/view/querybase.html.php b/module/dataview/view/querybase.html.php
index fb94cc79f0..b1881452b1 100644
--- a/module/dataview/view/querybase.html.php
+++ b/module/dataview/view/querybase.html.php
@@ -90,7 +90,7 @@
   <div class="modal-dialog" style="width: 1200px;">
     <div class="modal-content">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only"><?php echo $lang->common->close;?></span></button>
+        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only"><?php echo $lang->close;?></span></button>
         <h4 class="modal-title"><?php echo $lang->dataview->fieldSettings;?></h4>
       </div>
       <div class="modal-body">
diff --git a/module/pivot/model.php b/module/pivot/model.php
index eaf61587e8..f6b65e6171 100644
--- a/module/pivot/model.php
+++ b/module/pivot/model.php
@@ -2033,8 +2033,9 @@ class pivotModel extends model
         {
             foreach($record as $field => $value)
             {
-                $optionList  = isset($fieldOptions[$field]) ? $fieldOptions[$field] : array();
-                $record[$field] = isset($optionList[$value]) ? $optionList[$value] : $value;
+                $optionList     = isset($fieldOptions[$field]) ? $fieldOptions[$field] : array();
+                $valueKey       = "$value";
+                $record[$field] = isset($optionList[$valueKey]) ? $optionList[$valueKey] : $value;
             }
 
             $records[$index] = (object)$record;
@@ -2565,7 +2566,7 @@ class pivotModel extends model
                     $options = array();
                     if(is_array($source))
                     {
-                        foreach($source as $row) $options[$row->$field] = $row->$field;
+                        foreach($source as $row) $options["{$row->$field}"] = $row->$field;
                     }
                 }
                 break;
@@ -2775,9 +2776,10 @@ class pivotModel extends model
         foreach($data->cols[0] as $col)
         {
             $colspan = zget($col, 'colspan', 1);
-            $colShowOrigin = array_fill(0, $colspan, $col->showOrigin);
+            $showOrigin = isset($col->showOrigin) ? $col->showOrigin : false;
+            $colShowOrigin = array_fill(0, $colspan, $showOrigin);
             $showOrigins = array_merge($showOrigins, $colShowOrigin);
-            if($col->showOrigin) $hasShowOrigin = true;
+            if($showOrigin) $hasShowOrigin = true;
         }
 
         /* Init table thead. */