diff --git a/js/personAdmin/personSearch1.js b/js/personAdmin/personSearch1.js
index 01802fc..807779d 100644
--- a/js/personAdmin/personSearch1.js
+++ b/js/personAdmin/personSearch1.js
@@ -117,7 +117,7 @@ function c_personSearch1 (fname, sname, fnameAlt, snameAlt, names, person)
 		}
 
 		if (this.person != null)
-			if (this.fNameBest[1] == 0)
+			if (this.sNameBest[1] == 0 && this.fNameBest[1] == 0)
 				this.person.update (
 					this.persons[this.sNameBest[2]][this.fNameBest[2]]);
 			else
@@ -157,7 +157,7 @@ function c_personSearch1 (fname, sname, fnameAlt, snameAlt, names, person)
 						 len < dists.lenth)
 					len++;
 			else
-				len = dists.length - 1;
+				len = dists.length;
 
 			for (var i=0; i<len; i++)
 				// walk through all matches
@@ -188,7 +188,7 @@ function c_personSearch1 (fname, sname, fnameAlt, snameAlt, names, person)
 		return len;
 	}
 
-	this.altSurnames = function (_event)
+	this.altSurnames = function ()
 	{
 		var surname  = document.getElementById (this.surname);
 		var sNameAlt = document.getElementById (this.sNameAlt);
@@ -279,8 +279,6 @@ function personSearch1AltFirstnameHandler (_event)
 	else if (_event.keyCode)
 		var keycode = _event.keyCode;
 
-	var dists = pSearch1.fnameDists;
-
 	// pSearch1 wird im php personSearch1.js angelegt.
 	switch (keycode)
 	{
@@ -291,13 +289,12 @@ function personSearch1AltFirstnameHandler (_event)
 			pSearch1.incFnameIdx ();
 			break;
 		case 13:
-			pSearch1.hide ('personSearch1_fBestFit');
-			break;
+			return pSearch1.hide ('personSearch1_fBestFit');
 		default:
 			pSearch1.fnameIdx = -1;
 	}
 
-	pSearch1.altFirstnames ();
+	return pSearch1.altFirstnames ();
 }
 
 function personSearch1AltSurnameHandler (_event)
@@ -310,8 +307,6 @@ function personSearch1AltSurnameHandler (_event)
 	else if (_event.keyCode)
 		var keycode = _event.keyCode;
 
-	var dists = pSearch1.snameDists;
-
 	// pSearch1 wird im php personSearch1.js angelegt.
 	switch (keycode)
 	{
@@ -322,11 +317,10 @@ function personSearch1AltSurnameHandler (_event)
 			pSearch1.incSnameIdx ();
 			break;
 		case 13:
-			pSearch1.hide ('personSearch1_sBestFit');
-			break;
+			return pSearch1.hide ('personSearch1_sBestFit');
 		default:
 			pSearch1.snameIdx = -1;
 	}
 
-	pSearch1.altSurnames ();
+	return pSearch1.altSurnames ();
 }