diff --git a/appointment-import/src/main/java/smash/appointment/parse/LihControlMappingParser.java b/appointment-import/src/main/java/smash/appointment/parse/LihControlMappingParser.java
index 101443570187610dee5164e2d880f3ba6caa3534..3163eed9966d052bea816326d4ae3632ff2406bc 100644
--- a/appointment-import/src/main/java/smash/appointment/parse/LihControlMappingParser.java
+++ b/appointment-import/src/main/java/smash/appointment/parse/LihControlMappingParser.java
@@ -37,7 +37,7 @@ public class LihControlMappingParser extends SubjectParser {
 	protected String parseNdNumber(Row row) {
 		String number = getString(row.getCell(7));
 		
-		if (number.equalsIgnoreCase("PK") ||number.equalsIgnoreCase("CHEM")) {
+		if (number.equalsIgnoreCase("PK") ||number.equalsIgnoreCase("CHEM") || number.equalsIgnoreCase("Flying Team")) {
 			number = "";
 		}
 		return number;
diff --git a/appointment-import/src/main/java/smash/appointment/parse/Subject.java b/appointment-import/src/main/java/smash/appointment/parse/Subject.java
index 87169eaead29c4830d581f4bbab612d746bcf68d..61ef020b26569c680433a5ebb8702f04ef470cb6 100644
--- a/appointment-import/src/main/java/smash/appointment/parse/Subject.java
+++ b/appointment-import/src/main/java/smash/appointment/parse/Subject.java
@@ -228,9 +228,9 @@ public class Subject {
 	 * @see #zipCode
 	 */
 	public void setZipCode(String zipCode) {
-		if (zipCode != null && zipCode.length() > 50) {
+		if (zipCode != null && zipCode.length() > 7) {
 			logger.warn("Surname too long. Ignoring: " + zipCode);
-			zipCode = zipCode.substring(0, 50);
+			zipCode = zipCode.substring(0, 7);
 		} else {
 			this.zipCode = zipCode;
 		}