diff --git a/include/DirSearch.php b/include/DirSearch.php
index 8682cb18ef..99a0698d46 100644
--- a/include/DirSearch.php
+++ b/include/DirSearch.php
@@ -13,9 +13,9 @@ class DirSearch {
 
 	/**
 	 * @brief Search global contact table by nick or name
-	 *  * 
+	 *
 	 * @param string $search Name or nick
-	 * @param string $mode Search mode 
+	 * @param string $mode Search mode (e.g. "community")
 	 * @return array with search results
 	 */
 	public static function global_search_by_name($search, $mode = '') {
@@ -32,7 +32,7 @@ class DirSearch {
 			else
 				$ostatus = NETWORK_DFRN;
 
-			// check if fo
+			// check if we search only communities or every contact
 			if($mode === "community")
 				$extra_sql = " AND `community`";
 			else
@@ -46,12 +46,13 @@ class DirSearch {
 							AND NOT `contact`.`pending` AND `contact`.`rel` IN ('%s', '%s')
 						WHERE (`contact`.`id` > 0 OR (NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND
 						((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`)))) AND
-						(`gcontact`.`name` REGEXP '%s' OR `gcontact`.`nick` REGEXP '%s') $extra_sql
+						(`gcontact`.`addr` REGEXP '%s' OR `gcontact`.`name` REGEXP '%s' OR `gcontact`.`nick` REGEXP '%s') $extra_sql
 							GROUP BY `gcontact`.`nurl`
-							ORDER BY `gcontact`.`updated` DESC ",
+							ORDER BY `gcontact`.`nurl` DESC
+							LIMIT 40",
 						intval(local_user()), dbesc(CONTACT_IS_SHARING), dbesc(CONTACT_IS_FRIEND),
 						dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora),
-						dbesc(escape_tags($search)), dbesc(escape_tags($search)));
+						dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search)));
 
 			return $results;
 		}
diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 47f97250f8..65f125b852 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -556,7 +556,7 @@ function acl_lookup(&$a, $out_type = 'json') {
 		if($r) {
 			foreach($r as $g) {
 				$contacts[] = array(
-					"photo"    => $g['photo'],
+					"photo"    => proxy_url($g['photo'], false, PROXY_SIZE_MICRO),
 					"name"     => $g['name'],
 					"nick"     => (x($g['addr']) ? $g['addr'] : $g['url']),
 					"network" => $g['network'],
diff --git a/mod/dirfind.php b/mod/dirfind.php
index 0dfe4d67a9..f517bb72d0 100644
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -101,11 +101,11 @@ function dirfind_content(&$a, $prefix = "") {
 					WHERE (`contact`.`id` > 0 OR (NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND
 					((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`)))) AND
 					(`gcontact`.`url` REGEXP '%s' OR `gcontact`.`name` REGEXP '%s' OR `gcontact`.`location` REGEXP '%s' OR
-						`gcontact`.`about` REGEXP '%s' OR `gcontact`.`keywords` REGEXP '%s') $extra_sql",
+						`gcontact`.`addr` REGEXP '%s' OR `gcontact`.`about` REGEXP '%s' OR `gcontact`.`keywords` REGEXP '%s') $extra_sql",
 					intval(local_user()), dbesc(CONTACT_IS_SHARING), dbesc(CONTACT_IS_FRIEND),
 					dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora),
 					dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search)),
-					dbesc(escape_tags($search)), dbesc(escape_tags($search)));
+					dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search)));
 
 			$results = q("SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`photo`, `gcontact`.`network`, `gcontact`.`keywords`, `gcontact`.`addr`
 					FROM `gcontact`
@@ -115,13 +115,13 @@ function dirfind_content(&$a, $prefix = "") {
 					WHERE (`contact`.`id` > 0 OR (NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND
 					((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`)))) AND
 					(`gcontact`.`url` REGEXP '%s' OR `gcontact`.`name` REGEXP '%s' OR `gcontact`.`location` REGEXP '%s' OR
-						`gcontact`.`about` REGEXP '%s' OR `gcontact`.`keywords` REGEXP '%s') $extra_sql
+						`gcontact`.`addr` REGEXP '%s' OR `gcontact`.`about` REGEXP '%s' OR `gcontact`.`keywords` REGEXP '%s') $extra_sql
 						GROUP BY `gcontact`.`nurl`
 						ORDER BY `gcontact`.`updated` DESC LIMIT %d, %d",
 					intval(local_user()), dbesc(CONTACT_IS_SHARING), dbesc(CONTACT_IS_FRIEND),
 					dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora),
 					dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search)),
-					dbesc(escape_tags($search)), dbesc(escape_tags($search)),
+					dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search)),
 					intval($startrec), intval($perpage));
 			$j = new stdClass();
 			$j->total = $count[0]["total"];