diff --git a/Dockerfile b/Dockerfile
index 9d24867..809ccb5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,4 +45,5 @@
 LABEL repository="https://github.com/KorAP/KoralPipe-TermMapper"
 
 # docker build -f Dockerfile -t korap/koralpipe-termmapper:latest .
-# docker run --rm --network host korap/koralpipe-termmapper:latest -m /mappings/*.yaml
\ No newline at end of file
+# docker run --rm --network host korap/koralpipe-termmapper:latest -m /mappings/*.yaml
+# docker save -o korap-koralpipe-termmapper-latest.tar korap/koralpipe-termmapper:latest
\ No newline at end of file
diff --git a/cmd/termmapper/main_test.go b/cmd/termmapper/main_test.go
index 80c7f4b..1447a15 100644
--- a/cmd/termmapper/main_test.go
+++ b/cmd/termmapper/main_test.go
@@ -268,7 +268,7 @@
 		FoundryB: "opennlp",
 		LayerB:   "p",
 		Mappings: []tmconfig.MappingRule{
-			"[gender=masc] <> [p=M & m=M]",
+			"[gender:masc] <> [p=M & m=M]",
 		},
 	}
 
diff --git a/mapper/response.go b/mapper/response.go
index 8fe1fc1..9dcc63f 100644
--- a/mapper/response.go
+++ b/mapper/response.go
@@ -88,34 +88,6 @@
 			ast.ApplyFoundryAndLayerOverrides(processedPattern, patternFoundry, patternLayer)
 		}
 
-		// WORKAROUND: Fix the incorrectly parsed pattern
-		// If the original layer is "gender" and key is "masc", fix it
-		originalTerm, isOriginalTerm := pattern.(*ast.Term)
-		if isOriginalTerm && originalTerm.Layer == "gender" && originalTerm.Key == "masc" {
-			// Create the correct pattern: foundry/layer from opts, key=gender, value=masc
-			// If foundry/layer are empty, get them from the mapping list
-			fixedFoundry := patternFoundry
-			fixedLayer := patternLayer
-			if fixedFoundry == "" {
-				mappingList := m.mappingLists[mappingID]
-				if opts.Direction { // AtoB
-					fixedFoundry = mappingList.FoundryA
-					fixedLayer = mappingList.LayerA
-				} else {
-					fixedFoundry = mappingList.FoundryB
-					fixedLayer = mappingList.LayerB
-				}
-			}
-
-			processedPattern = &ast.Term{
-				Foundry: fixedFoundry,
-				Layer:   fixedLayer,
-				Key:     "gender",
-				Value:   "masc",
-				Match:   ast.MatchEqual,
-			}
-		}
-
 		// Create snippet matcher for this rule
 		snippetMatcher, err := matcher.NewSnippetMatcher(
 			ast.Pattern{Root: processedPattern},
diff --git a/mapper/response_test.go b/mapper/response_test.go
index 67674d7..2f918e4 100644
--- a/mapper/response_test.go
+++ b/mapper/response_test.go
@@ -502,7 +502,7 @@
 		FoundryB: "opennlp",
 		LayerB:   "p",
 		Mappings: []config.MappingRule{
-			"[gender=masc] <> [p=M & m=M]",
+			"[gender:masc] <> [p=M & m=M]",
 		},
 	}