diff --git a/docs/README.md b/docs/README.md
index f8b8d6dc..4e8d48bf 100755
--- a/docs/README.md
+++ b/docs/README.md
@@ -66,6 +66,7 @@ There is also an in-app Help / FAQ section that should be answering frequently a
 
 #### 👩‍💻For Developers👨‍💻
 
+- [Setting up your DEV environment](/docs/DEV_ENV_SETUP.md)
 - [Server APP code structure](/server/README.md)
 - [Database structure](/docs/DATABASE.md)
 - [API endpoints details](/docs/API.md)
diff --git a/front/php/templates/language/fr_fr.json b/front/php/templates/language/fr_fr.json
old mode 100644
new mode 100755
diff --git a/front/php/templates/language/it_it.json b/front/php/templates/language/it_it.json
old mode 100644
new mode 100755
diff --git a/install/netalertx.template.conf b/install/netalertx.template.conf
index 66e2a364..1dd514cc 100755
--- a/install/netalertx.template.conf
+++ b/install/netalertx.template.conf
@@ -5,12 +5,12 @@ server {
     add_header X-Forwarded-Prefix "/app" always;
     proxy_set_header X-Forwarded-Prefix "/app";
 
-    # Increase buffer sizes to handle larger headers
-    proxy_buffer_size 512k;
-    proxy_buffers 16 512k;
-    proxy_busy_buffers_size 512k;
-    proxy_http_version 1.1;
-    proxy_set_header Connection "";
+    # # Increase buffer sizes to handle larger headers
+    # proxy_buffer_size 512k;
+    # proxy_buffers 16 512k;
+    # proxy_busy_buffers_size 512k;
+    # proxy_http_version 1.1;
+    # proxy_set_header Connection "";
 
 
   # # Whitelisting IP addresses
diff --git a/server/database.py b/server/database.py
index b9f636d2..1faf2f5c 100755
--- a/server/database.py
+++ b/server/database.py
@@ -486,7 +486,8 @@ class DB():
                                 cur_NetworkSite STRING(250),
                                 cur_SSID STRING(250),
                                 cur_NetworkNodeMAC STRING(250),
-                                cur_PORT STRING(250)
+                                cur_PORT STRING(250),
+                                cur_Type STRING(250)
                             );
                         """)
 
diff --git a/server/device.py b/server/device.py
index 108da2c5..a0f8d648 100755
--- a/server/device.py
+++ b/server/device.py
@@ -168,7 +168,6 @@ def create_new_devices (db):
                           dev_SkipRepeated, 
                           dev_ScanCycle, 
                           dev_Owner, 
-                          dev_DeviceType, 
                           dev_Favorite, 
                           dev_Group, 
                           dev_Comments, 
@@ -184,7 +183,6 @@ def create_new_devices (db):
                           {get_setting_value('NEWDEV_dev_SkipRepeated')}, 
                           {get_setting_value('NEWDEV_dev_ScanCycle')}, 
                           '{get_setting_value('NEWDEV_dev_Owner')}', 
-                          '{get_setting_value('NEWDEV_dev_DeviceType')}',
                           {get_setting_value('NEWDEV_dev_Favorite')}, 
                           '{get_setting_value('NEWDEV_dev_Group')}', 
                           '{get_setting_value('NEWDEV_dev_Comments')}', 
@@ -208,7 +206,8 @@ def create_new_devices (db):
                             dev_Network_Node_MAC_ADDR, 
                             dev_Network_Node_port,
                             dev_NetworkSite, 
-                            dev_SSID,                          
+                            dev_SSID,
+                            dev_DeviceType,                          
                             {newDevColumns}
                         )
                         SELECT 
@@ -224,6 +223,7 @@ def create_new_devices (db):
                             cur_PORT,
                             cur_NetworkSite, 
                             cur_SSID,
+                            CASE WHEN LENGTH(TRIM(cur_Type)) > 0 THEN cur_Type ELSE '{get_setting_value('NEWDEV_dev_DeviceType')}' END,
                             {newDevDefaults}
                     FROM CurrentScan
                         WHERE 1=1