diff --git a/internal/photoprism/import_worker.go b/internal/photoprism/import_worker.go
index 560ccc7c3..5e2bbe891 100644
--- a/internal/photoprism/import_worker.go
+++ b/internal/photoprism/import_worker.go
@@ -158,7 +158,6 @@ func ImportWorker(jobs <-chan ImportJob) {
 				log.Infof("import: %s related %s file %s", res, f.FileType(), txt.Quote(f.RelativeName(ind.originalsPath())))
 			}
 
-
 		}
 	}
 }
diff --git a/internal/query/photo_results.go b/internal/query/photo_results.go
index 5aee0997e..07b03d841 100644
--- a/internal/query/photo_results.go
+++ b/internal/query/photo_results.go
@@ -11,7 +11,6 @@ import (
 	"github.com/ulule/deepcopier"
 )
 
-
 // PhotoResult contains found photos and their main file plus other meta data.
 type PhotoResult struct {
 	ID               uint          `json:"-"`
diff --git a/pkg/rnd/uid.go b/pkg/rnd/uid.go
index 6c01700d7..ec621b287 100644
--- a/pkg/rnd/uid.go
+++ b/pkg/rnd/uid.go
@@ -31,7 +31,7 @@ func IsHex(s string) bool {
 	}
 
 	for _, r := range s {
-		if (r < 48 || r > 57) && (r < 97 || r > 102) && (r < 65 || r > 90) && r != 45{
+		if (r < 48 || r > 57) && (r < 97 || r > 102) && (r < 65 || r > 90) && r != 45 {
 			return false
 		}
 	}
diff --git a/pkg/txt/capitalization.go b/pkg/txt/capitalization.go
index ba3b35ded..5037767b1 100644
--- a/pkg/txt/capitalization.go
+++ b/pkg/txt/capitalization.go
@@ -11,39 +11,60 @@ import (
 var FileTitleRegexp = regexp.MustCompile("[\\p{L}\\-]{2,}")
 
 var SpecialWords = map[string]string{
-	"nyc":           "NYC",
-	"ny":            "NY",
-	"uae":           "UAE",
-	"usa":           "USA",
-	"amd":           "AMD",
-	"tiff":          "TIFF",
-	"ibm":           "IBM",
-	"usd":           "USD",
-	"gbp":           "GBP",
-	"chf":           "CHF",
-	"ceo":           "CEO",
-	"cto":           "CTO",
-	"cfo":           "CFO",
-	"cia":           "CIA ",
-	"fbi":           "FBI",
-	"bnd":           "BND",
-	"fsb":           "FSB",
-	"nsa":           "NSA",
-	"lax":           "LAX",
-	"sfx":           "SFX",
-	"ber":           "BER",
-	"sfo":           "SFO",
-	"lh":            "LH",
-	"lhr":           "LHR",
-	"afl":           "AFL",
-	"nrl":           "NRL",
-	"nsw":           "NSW",
-	"qld":           "QLD",
-	"vic":           "VIC",
-	"iphone":        "iPhone",
-	"imac":          "iMac",
-	"ipad":          "iPad",
-	"macbook":       "MacBook",
+	"nyc":                "NYC",
+	"ny":                 "NY",
+	"uae":                "UAE",
+	"usa":                "USA",
+	"amd":                "AMD",
+	"tiff":               "TIFF",
+	"ibm":                "IBM",
+	"usd":                "USD",
+	"gbp":                "GBP",
+	"chf":                "CHF",
+	"ceo":                "CEO",
+	"cto":                "CTO",
+	"cfo":                "CFO",
+	"cia":                "CIA ",
+	"fbi":                "FBI",
+	"bnd":                "BND",
+	"fsb":                "FSB",
+	"nsa":                "NSA",
+	"lax":                "LAX",
+	"sfx":                "SFX",
+	"ber":                "BER",
+	"sfo":                "SFO",
+	"lh":                 "LH",
+	"lhr":                "LHR",
+	"afl":                "AFL",
+	"nrl":                "NRL",
+	"nsw":                "NSW",
+	"qld":                "QLD",
+	"vic":                "VIC",
+	"iphone":             "iPhone",
+	"imac":               "iMac",
+	"ipad":               "iPad",
+	"macbook":            "MacBook",
+	"gelaende":           "Gelände",
+	"schwaebisch":        "Schwäbisch",
+	"schwaebische":       "Schwäbische",
+	"aegypten":           "Ägypten",
+	"muenchen":           "München",
+	"wuerttemberg":       "Württemberg",
+	"baden-wuerttemberg": "Baden-Württemberg",
+	"nuernberg":          "Nürnberg",
+	"wuerzburg":          "Würzburg",
+	"tubingen":           "Tübingen",
+	"tuebingen":          "Tübingen",
+	"koeln":              "Köln",
+	"oesterreich":        "Österreich",
+	"woerthersee":        "Wörthersee",
+	"oeland":             "Öland",
+	"schoenefeld":        "Schönefeld",
+	"duesseldorf":        "Düsseldorf",
+	"dusseldorf":         "Düsseldorf",
+	"saarbrucken":        "Saarbrücken",
+	"saarbruecken":       "Saarbrücken",
+	"zuerich":            "Zürich",
 }
 
 var SmallWords = map[string]bool{
diff --git a/pkg/txt/countries.go b/pkg/txt/countries.go
index 2576bf9a6..11a116332 100644
--- a/pkg/txt/countries.go
+++ b/pkg/txt/countries.go
@@ -108,6 +108,7 @@ var Countries = map[string]string{
 	"greifswald":                            "de",
 	"dresden":                               "de",
 	"nürnberg":                              "de",
+	"würzburg":                              "de",
 	"munich":                                "de",
 	"frankfurt":                             "de",
 	"brandenburg":                           "de",
diff --git a/pkg/txt/resources/countries.txt b/pkg/txt/resources/countries.txt
index 1054781ae..5ddd1c337 100644
--- a/pkg/txt/resources/countries.txt
+++ b/pkg/txt/resources/countries.txt
@@ -104,6 +104,7 @@ DE:Schwerin
 DE:Greifswald
 DE:Dresden
 DE:Nürnberg
+DE:Würzburg
 DE:Munich
 DE:Frankfurt
 DE:Brandenburg