diff --git a/afu/.gender b/afu/.gender
index d9ad693..0e223c8 100644
--- a/afu/.gender
+++ b/afu/.gender
@@ -3,21 +3,25 @@ m Abdull
 m Achaz
 m Adalbert
 m Adalberto
+m Adolf
 m Alastair
+m Albert
 m Albin
 m Albrecht
 m Aleksandar
 m Aleksander
 m Aleksey
 m Alexander
-m Alfons
 m Alfger
+m Alfons
+m Alfred
 m Aljoscha
 m Aljosha
 m Alois
 m Alvaro
 m András
 m Andràs
+m Andre
 m Andreas
 m Andrej
 m Ansgar
@@ -34,6 +38,7 @@ m Artur
 m Attila
 m Augustinus
 m Avdija
+m Axel
 m Baldur
 m Bartlmä
 m Benedict
@@ -48,6 +53,7 @@ m Bevan
 m Bogoljub
 m Boguslaw
 m Bohumil
+m Boris
 m Branko
 m Brenden
 m Bruno
@@ -60,8 +66,8 @@ m Carlo
 m Carlos
 m Cezar-Iuliu
 m Charles
+m Chris
 m Christian
-m Christian-Andrei
 m Christian-Erich
 m Christof
 m Christoph
@@ -72,29 +78,45 @@ m Claus
 m Clemens
 m Cornelius
 m Craig
+m Cristian-Andrei
 m Cyrill
 m Daniel
+m Darko
 m David
 m Denis
 m Detlef
+m Dieter
 m Dietmar
-m Domenik
+m Dirk
+m Domenikhttp://adminer.localhost/?username=om&db=callbook&select=callbook_user
 m Dominic
 m Dominik
 m Dominique
 m Dragan
+m Dustin
 m Guenter
+m Eberhard
 m Eckart
 m Eduard
 m Edward
+m Edwin
 m Egidius
+m Egon
+m Elmar
+m Emil
+m Emir
 m Emmerich
 m Engelbert
 m Enrico
+m Erhard
+m Eric
+m Erich
+m Erik
 m Ernest
 m Ernst
 m Erwin
 m Eugen
+m Ewald
 m Fabian
 m Fabio
 m Felix
@@ -106,6 +128,7 @@ m Francesco
 m Frank
 m Franz
 m Franz-Joseph
+m Fred
 m Frederick
 m Frederikus
 m Fredy
@@ -117,12 +140,16 @@ m Frohwald
 m Gabriel
 m Gavril
 m Gebhard
+m Geert
 m Georg
+m Gerald
 m Gerfried
 m Gerhard
 m Gernod
 m Gernot
 m Gerold
+m Gert
+m Gilbert
 m Giulio
 m Gisbert
 m Gottfried
@@ -132,10 +159,13 @@ m Gregor-Emanuel
 m Guenther
 m Guido
 m Gunnar
+m Gunter
+m Günter
 m Günther
 m Guntram
 m Gustav
 m Gustav-Josef
+m Hannes
 m Hanno
 m Hanns
 m Hanns-Michael
@@ -160,12 +190,14 @@ m Heimo
 m Heiner-Anton
 m Heinrich
 m Heinz
+m Helfried
 m Hellmut
 m Hellmuth
 m Helmut
 m Helmuth
 m Henning
 m Henryk
+m Herbert
 m Heribert
 m Hermann
 m Herolind
@@ -175,6 +207,7 @@ m Horst
 m Hubert
 m Ingo
 m Ingulf
+m Ivan
 m Ivaylo
 m Izudin
 m Jacob
@@ -185,6 +218,8 @@ m Jochen
 m Joerg
 m Jonas
 m Jonathan
+m Jörg
+m Jörn
 m Josef
 m Josef-Manfred
 m Joseph-Maria
@@ -196,12 +231,14 @@ m Julian
 m Julius
 m Junichi
 m Jürgen
+m Karl
 m Karl-Heinz
 m Karl-Otto
 m Karl-Thomas
 m Karlheinz
 m Katarina
 m Kevin
+m Kilian
 m Klaus
 m Klaus-Dieter
 m Klaus-Jürgen
@@ -209,18 +246,23 @@ m Klemens
 m Konrad
 m Konstantin
 m Krzysztof
-m Laurence OE6LUN
+m Kurt
+m Laurence
 m Laurenz
 m Laurin
 m Laszlo
+m Leo
+m Leon
 m Leonel
 m Leonhard
 m Leopold
 m Liam
+m Lorenz
 m Lothar
 m Lucas
 m Luciano
 m Ludwig
+m Luis
 m Lukas
 m Manfred
 m Manuel
@@ -235,12 +277,14 @@ m Marko
 m Markus
 m Martin
 m Marzell
+m Mathias
 m Matija
 m Matteo
 m Matteo-Alessandro
 m Matthäus
 m Matthew
 m Matthias
+m Max
 m Maxim
 m Maximilian
 m Meinrad
@@ -260,7 +304,7 @@ m Nicolas
 m Niels-Henrik
 m Niklas
 m Nikolas
-m Mikolaus
+m Nikolaus
 m Noah
 m Norbert
 m Ole-Christian
@@ -268,8 +312,11 @@ m Oliver
 m Oliver-Helmut
 m Ortwin
 m Othmar
+m Otmar
+m Otto
 m Ovidiu
 m Ovidiu-Dan
+m Ozren
 m Patrick
 m Patrik
 m Paul
@@ -290,16 +337,20 @@ m Raffael
 m Raffi
 m Raoul
 m Raphael
+m Ralf
 m Ralph
 m Reinald
 m Reinhard
 m Reinhart
 m Rembert
+m Rene
 m Riccardo
 m Richard
 m Reinhold
 m René
 m René-Lysander
+m Robert
+m Roger
 m Roland
 m Rolf-Dietrich
 m Romain
@@ -314,6 +365,7 @@ m Sandro
 m Santiago
 m Sebastian
 m Seong
+m Sepp
 m Severin
 m Siegfried
 m Siegmar
@@ -326,19 +378,26 @@ m Stelio
 m Stephan
 m Stephen
 m Subagio-Rasidi
+m Sven
 m Sven-Erik
+m Tamer
 m Tamim
 m Theodor
 m Thomas
 m Thomas-Michael
 m Thorsten
 m Tillmann
+m Tim
 m Tobias
 m Tomislav
 m Tommaso
 m Tonny
+m Udo
+m Ulf
+m Ulrich
 m Ümmet
 m Urban
+m Uwe
 m Valentin
 m Valerian
 m Viktor
@@ -348,6 +407,7 @@ m Vladimir
 m Volker
 m Waldemar
 m Walter
+m Werfried
 m Werner
 m Wieland
 m Wigbert
@@ -370,6 +430,7 @@ f Andrea
 f Angela
 f Angelika
 f Anita
+f Anja
 f Anna
 f Anna-Maria
 f Anneliese
@@ -377,10 +438,12 @@ f Annemarie
 f Astrid
 f Auguste
 f Barbara
+f Beate
 f Beatrice
 f Beatrix
 f Bernadette
 f Bernardine
+f Berta
 f Bettina
 f Bianca
 f Birgit
@@ -392,13 +455,20 @@ f Christa
 f Christine
 f Christl
 f Cornelia
+f Dagmar
+f Doris
 f Durdica
+f Edda
 f Edeltraud
+f Edith
 f Elfriede
 f Elisabeth
 f Elke
+f Ella
 f Erdmuthe
 f Ernestine
+f Esther
+f Eva
 f Eva-Maria
 f Eveline
 f Evelyn
@@ -407,12 +477,14 @@ f Franziska
 f Frederike
 f Frieda
 f Friederike
+f Gabi
 f Gabriela
 f Gabriella
 f Gabriele
 f Gerda
 f Gerlinde
 f Gertraude
+f Gertrud
 f Gertrude
 f Gisela
 f Gudrun
@@ -426,10 +498,16 @@ f Helga
 f Hemma
 f Hermine
 f Herta
+f Hilde
 f Hildegard
+f Ida-Maria
+f Ilse
+f Inge
 f Ingeborg
 f Ingeburg
 f Ingrid
+f Irene
+f Iris
 f Isabel
 f Isabella
 f Isolde
@@ -465,8 +543,10 @@ f Manfreda
 f Manuela
 f Margareta
 f Margarethe
+f Margit
 f Margot
 f Margret
+f Maria
 f Marianne
 f Marie-Luise
 f Marina
@@ -478,6 +558,7 @@ f Mathilde
 f Mechthild
 f Melanie
 f Michaela
+f Monika
 f Nadine
 f Natasa
 f Natascha
@@ -489,6 +570,7 @@ f Olivia
 f Patrizia
 f Paulina
 f Pauline
+f Petra
 f Phaedra
 f Regina
 f Reinhilde
@@ -517,8 +599,10 @@ f Tamara
 f Tanja
 f Tatjana
 f Theresia
+f Tina
 f Ulrike
 f Ursula
+f Ute
 f Valerie
 f Valery
 f Veronika
diff --git a/afu/callbook.py b/afu/callbook.py
index 6264ea1..2bbc963 100755
--- a/afu/callbook.py
+++ b/afu/callbook.py
@@ -107,7 +107,7 @@ def is_clubstation(call):
 	assert(len(call) > 3)
 	if call[3].upper() == 'X' or call.upper() == 'OE5SIX': # special case with OE5SIX (Clubstation)
 		return True
-	
+
 	return False
 
 
@@ -126,7 +126,7 @@ def replace_substring_with_line(path, search_substring, verbose=0):
 		print(f'The file {path} was not found.')
 	except Exception as e:
 		print(f'An error occurred: {e}')
-	
+
 	return search_substring
 
 replace_substring_with_line.lines = None
@@ -138,8 +138,8 @@ def gender_substring(path, search_substring, verbose=0):
 				gender_substring.lines = file.readlines()
 
 		for line in gender_substring.lines:
-			if search_substring[2:].lower() in line.lower():
-				return line[0]
+			if line[2:].strip() == search_substring: # search from position 2 and remove all spaces or \n chars
+				return line[0] # return the char of gender i.e. 'f' or 'm'
 	except FileNotFoundError:
 		print(f'The file {path} was not found.')
 	except Exception as e:
@@ -172,9 +172,9 @@ def call_split_name(fullname, call, verbose):
 
 	name = fullname.split(' ', 1)
 	surname = name[0]
-	# several special cases like surname "de Lijezer", "van Dijk", "el Shamaa", etc.
+	# several special cases like surname "de Lijezer", "van Dijk", "el Shamaa", "da Silva", etc.
 	match surname.lower():
-		case 'de' | 'el':
+		case 'de' | 'el' | 'da':
 			name = fullname[3:].split(' ',1)
 			surname = surname.lower() + ' ' + name[0]
 			if verbose > 1: