diff --git a/classes/db/DBMysql.class.php b/classes/db/DBMysql.class.php
index 22dd225b1..07fdf3df9 100644
--- a/classes/db/DBMysql.class.php
+++ b/classes/db/DBMysql.class.php
@@ -288,7 +288,8 @@
                     $type = $output->column_type[$name];
                     $pipe = $v['pipe'];
 
-                    if(strpos($value,'.')===false) $value = $this->getConditionValue($name, $value, $operation, $type);
+                    $value = $this->getConditionValue($name, $value, $operation, $type);
+                    if(!$value) $value = $v['value'];
                     $str = $this->getConditionPart($name, $value, $operation);
                     if($sub_condition) $sub_condition .= ' '.$pipe.' ';
                     $sub_condition .=  $str;
@@ -319,9 +320,7 @@
                 if($output->column_type[$name]!='number') {
                     $value = "'".$this->addQuotes($value)."'";
                     if(!$value) $value = 'null';
-                } else {
-                    if(!$value) $value = 0;
-                }
+                } elseif(!$value || is_numeric($value)) $value = (int)$value;
 
                 $column_list[] = '`'.$name.'`';
                 $value_list[] = $value;
@@ -346,7 +345,7 @@
                 $name = $val['name'];
                 $value = $val['value'];
                 if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'";
-                else $value = (int)$value;
+                elseif(!$value || is_numeric($value)) $value = (int)$value;
 
                 $column_list[] = sprintf("`%s` = %s", $name, $value);
             }
diff --git a/classes/db/DBMysql_innodb.class.php b/classes/db/DBMysql_innodb.class.php
index e9f090a16..3243be27a 100644
--- a/classes/db/DBMysql_innodb.class.php
+++ b/classes/db/DBMysql_innodb.class.php
@@ -297,7 +297,8 @@
                     $type = $output->column_type[$name];
                     $pipe = $v['pipe'];
 
-                    if(strpos($value,'.')===false) $value = $this->getConditionValue($name, $value, $operation, $type);
+                    $value = $this->getConditionValue($name, $value, $operation, $type);
+                    if(!$value) $value = $v['value'];
                     $str = $this->getConditionPart($name, $value, $operation);
                     if($sub_condition) $sub_condition .= ' '.$pipe.' ';
                     $sub_condition .=  $str;
@@ -328,9 +329,7 @@
                 if($output->column_type[$name]!='number') {
                     $value = "'".$this->addQuotes($value)."'";
                     if(!$value) $value = 'null';
-                } else {
-                    if(!$value) $value = 0;
-                }
+                } elseif(!$value || is_numeric($value)) $value = (int)$value;
 
                 $column_list[] = '`'.$name.'`';
                 $value_list[] = $value;
@@ -355,7 +354,7 @@
                 $name = $val['name'];
                 $value = $val['value'];
                 if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'";
-                else $value = (int)$value;
+                elseif(!$value || is_numeric($value)) $value = (int)$value;
 
                 $column_list[] = sprintf("`%s` = %s", $name, $value);
             }
diff --git a/classes/db/DBSqlite2.class.php b/classes/db/DBSqlite2.class.php
index 6685cddfa..f3e290050 100644
--- a/classes/db/DBSqlite2.class.php
+++ b/classes/db/DBSqlite2.class.php
@@ -292,7 +292,8 @@
                     $type = $output->column_type[$name];
                     $pipe = $v['pipe'];
 
-                    if(strpos($value,'.')===false) $value = $this->getConditionValue($name, $value, $operation, $type);
+                    $value = $this->getConditionValue($name, $value, $operation, $type);
+                    if(!$value) $value = $v['value'];
                     $str = $this->getConditionPart($name, $value, $operation);
                     if($sub_condition) $sub_condition .= ' '.$pipe.' ';
                     $sub_condition .=  $str;
@@ -323,9 +324,7 @@
                 if($output->column_type[$name]!='number') {
                     $value = "'".$this->addQuotes($value)."'";
                     if(!$value) $value = 'null';
-                } else {
-                    if(!$value) $value = 0;
-                }
+                } elseif(!$value || is_numeric($value)) $value = (int)$value;
 
                 $column_list[] = $name;
                 $value_list[] = $value;
@@ -350,7 +349,7 @@
                 $name = $val['name'];
                 $value = $val['value'];
                 if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'";
-                else $value = (int)$value;
+                elseif(!$value || is_numeric($value)) $value = (int)$value;
 
                 $column_list[] = sprintf("%s = %s", $name, $value);
             }
diff --git a/classes/db/DBSqlite3_pdo.class.php b/classes/db/DBSqlite3_pdo.class.php
index 9d417474e..2a0f40e84 100644
--- a/classes/db/DBSqlite3_pdo.class.php
+++ b/classes/db/DBSqlite3_pdo.class.php
@@ -319,7 +319,9 @@
                     $type = $output->column_type[$name];
                     $pipe = $v['pipe'];
 
-                    if(strpos($value,'.')===false) $value = $this->getConditionValue($name, $value, $operation, $type);
+                    $value = $this->getConditionValue($name, $value, $operation, $type);
+                    if(!$value) $value = $v['value'];
+
                     $str = $this->getConditionPart($name, $value, $operation);
                     if($sub_condition) $sub_condition .= ' '.$pipe.' ';
                     $sub_condition .=  $str;
@@ -351,7 +353,10 @@
                 $key_list[] = $name;
 
                 if($output->column_type[$name]!='number') $val_list[] = $this->addQuotes($value);
-                else $val_list[] = (int)$value;
+                else {
+                    if(!$value || is_numeric($value)) $value = (int)$value;
+                    $val_list[] = $value;
+                }
 
                 $prepare_list[] = '?';
             }
@@ -381,7 +386,10 @@
                 $name = $val['name'];
                 $value = $val['value'];
                 if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'";
-                else $value = (int)$value;
+                else {
+                    if(!$value || is_numeric($value)) $value = (int)$value;
+                    $val_list[] = $value;
+                }
 
                 $column_list[] = sprintf("%s = %s", $name, $value);
 
diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php
index 72f83953d..17353b2a9 100644
--- a/modules/file/file.controller.php
+++ b/modules/file/file.controller.php
@@ -255,7 +255,7 @@
             Context::set('buff', $buff);
 
             $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('print_uploaded_file_list.html');
+            $this->setTemplateFile('print_uploaded_file_list');
         }
 
         /**