diff --git a/.gitattributes b/.gitattributes
index 1ff0c4230..9d666d901 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -61,3 +61,7 @@
 #*.PDF   diff=astextplain
 #*.rtf   diff=astextplain
 #*.RTF   diff=astextplain
+
+###############################################################################
+# override Language definition for .sql files
+*.sql linguist-language=csharp
\ No newline at end of file
diff --git a/Source/Framework/Database/DatabaseUpdater.cs b/Source/Framework/Database/DatabaseUpdater.cs
index f0a6c3a77..a0a1311e0 100644
--- a/Source/Framework/Database/DatabaseUpdater.cs
+++ b/Source/Framework/Database/DatabaseUpdater.cs
@@ -51,10 +51,10 @@ namespace Framework.Database
                     fileName = @"\sql\base\characters_database.sql";
                     break;
                 case "WorldDatabase":
-                    fileName = @"\TDB_world_703.00_2016_10_17.sql";
+                    fileName = @"\TDB_world_720.00_2017_04_18.sql";
                     break;
                 case "HotfixDatabase":
-                    fileName = @"\TDB_hotfixes_703.00_2016_10_17.sql";
+                    fileName = @"\TDB_hotfixes_720.00_2017_04_18.sql";
                     break;     
             }
 
@@ -171,7 +171,7 @@ namespace Framework.Database
                 else
                 {
                     // If the hash of the files differs from the one stored in our database reapply the update (because it was changed).
-                    if (applied.Hash != hash)
+                    if (applied.Hash != hash && applied.State != State.ARCHIVED)
                     {
                         Log.outInfo(LogFilter.SqlUpdates, $"Reapplying update \"{availableQuery.GetFileName()}\" \'{applied.Hash.Substring(0, 7)}\' . \'{hash.Substring(0, 7)}\' (it changed)...");
                     }