diff --git a/mod/dirfind.php b/mod/dirfind.php
index 95f9bf53a..9e02a47e2 100644
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -38,10 +38,6 @@ function dirfind_content(&$a, $prefix = "") {
 
 	$o = '';
 
-	$o .= replace_macros(get_markup_template("section_title.tpl"),array(
-		'$title' => sprintf( t('People Search - %s'), $search)
-	));
-
 	if($search) {
 
 		if ($local) {
@@ -121,7 +117,6 @@ function dirfind_content(&$a, $prefix = "") {
 
 			$id = 0;
 
-			$tpl = get_markup_template('match.tpl');
 			foreach($j->results as $jj) {
 
 				// If We already know this contact then don't show the "connect" button
@@ -143,17 +138,27 @@ function dirfind_content(&$a, $prefix = "") {
 
 				$jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
 
-				$o .= replace_macros($tpl,array(
-					'$url' => zrl($jj->url),
-					'$name' => htmlentities($jj->name),
-					'$photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
-					'$tags' => $jj->tags,
-					'$conntxt' => $conntxt,
-					'$connlnk' => $connlnk,
-					'$photo_menu' => $photo_menu,
-					'$id' => ++$id,
-				));
+				$entry = array(
+					'url' => zrl($jj->url),
+					'name' => htmlentities($jj->name),
+					'photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
+					'tags' => $jj->tags,
+					'conntxt' => $conntxt,
+					'connlnk' => $connlnk,
+					'photo_menu' => $photo_menu,
+					'id' => ++$id,
+				);
+				$entries[] = $entry;
 			}
+
+		$tpl = get_markup_template('match.tpl');
+
+		$o .= replace_macros($tpl,array(
+			'title' => sprintf( t('People Search - %s'), $search),
+			'$entries' => $entries,
+			'$paginate' => paginate($a),
+		));
+
 		}
 		else {
 			info( t('No matches') . EOL);
@@ -161,7 +166,5 @@ function dirfind_content(&$a, $prefix = "") {
 
 	}
 
-	$o .= '<div class="clear"></div>';
-	$o .= paginate($a);
 	return $o;
 }
diff --git a/mod/match.php b/mod/match.php
index f31b0f67a..380f6e74a 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -4,6 +4,15 @@ require_once('include/socgraph.php');
 require_once('include/contact_widgets.php');
 require_once('mod/proxy.php');
 
+/**
+ * @brief Controller for /match.
+ *
+ * It takes keywords from your profile and queries the directory server for
+ * matching keywords from other profiles.
+ *
+ * @param App &$a
+ * @return void|string
+ */
 function match_content(&$a) {
 
 	$o = '';
@@ -15,10 +24,6 @@ function match_content(&$a) {
 
 	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
 
-	$o .= replace_macros(get_markup_template("section_title.tpl"),array(
-		'$title' => t('Profile Match')
-	));
-
 	$r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
 		intval(local_user())
 	);
@@ -27,7 +32,6 @@ function match_content(&$a) {
 	if(! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) {
 		notice( t('No keywords to match. Please add keywords to your default profile.') . EOL);
 		return;
-
 	}
 
 	$params = array();
@@ -52,9 +56,6 @@ function match_content(&$a) {
 
 		if(count($j->results)) {
 
-
-
-			$tpl = get_markup_template('match.tpl');
 			foreach($j->results as $jj) {
 				$match_nurl = normalise_link($jj->url);
 				$match = q("SELECT `nurl` FROM `contact` WHERE `uid` = '%d' AND nurl='%s' LIMIT 1",
@@ -63,24 +64,33 @@ function match_content(&$a) {
 				if (!count($match)) {
 					$jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
 					$connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
-					$o .= replace_macros($tpl,array(
-						'$url' => zrl($jj->url),
-						'$name' => $jj->name,
-						'$photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
-						'$inttxt' => ' ' . t('is interested in:'),
-						'$conntxt' => t('Connect'),
-						'$connlnk' => $connlnk,
-						'$tags' => $jj->tags
-					));
+					$entry = array(
+						'url' => zrl($jj->url),
+						'name' => $jj->name,
+						'photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
+						'inttxt' => ' ' . t('is interested in:'),
+						'conntxt' => t('Connect'),
+						'connlnk' => $connlnk,
+						'tags' => $jj->tags
+					);
+					$entries[] = $entry;
 				}
 			}
-		} else {
+
+		$tpl = get_markup_template('match.tpl');
+
+		$o .= replace_macros($tpl,array(
+			'$title' => t('Profile Match'),
+			'entries' => $entries,
+			'$paginate' => paginate($a),
+		));
+
+		}
+		else {
 			info( t('No matches') . EOL);
 		}
 
 	}
 
-	$o .= cleardiv();
-	$o .= paginate($a);
 	return $o;
 }
diff --git a/view/templates/match.tpl b/view/templates/match.tpl
index 3ebabf185..d269a253b 100644
--- a/view/templates/match.tpl
+++ b/view/templates/match.tpl
@@ -1,33 +1,40 @@
+{{include file="section_title.tpl"}}
 
-<div class="profile-match-wrapper">
-	<div class="profile-match-photo" id="contact-entry-photo-{{$id}}"
-                onmouseover="if (typeof t{{$id}} != 'undefined') clearTimeout(t{{$id}}); openMenu('contact-photo-menu-button-{{$id}}')" 
-                onmouseout="t{{$id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$id}}\'); closeMenu(\'contact-photo-menu-{{$id}}\');',200)" >
-		<a href="{{$url}}">
-			<img width="80" height="80" src="{{$photo}}" alt="{{$name}}" title="{{$name}}[{{$tags}}]" />
-		</a>
-		{{if $photo_menu}}
-                        <span onclick="openClose('contact-photo-menu-{{$id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$id}}">menu</span>
-                        <div class="contact-photo-menu" id="contact-photo-menu-{{$id}}">
-                                <ul>
-                                        {{foreach $photo_menu as $k=>$c}}
-                                        {{if $c.2}}
-                                        <li><a class="{{$k}}" target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
-                                        {{else}}
-                                        <li><a class="{{$k}}" href="{{$c.1}}">{{$c.0}}</a></li>
-                                        {{/if}}
-                                        {{/foreach}}
-                                </ul>
-                        </div>
-                        {{/if}}
-	</div>
-	<div class="profile-match-break"></div>
-	<div class="profile-match-name">
-		<a href="{{$url}}" title="{{$name}}[{{$tags}}]">{{$name}}</a>
-	</div>
-	<div class="profile-match-end"></div>
-	{{if $connlnk}}
-	<div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}">{{$conntxt}}</a></div>
-	{{/if}}
+{{foreach $entries as $entry}}
+	<div class="profile-match-wrapper">
+		<div class="profile-match-photo" id="contact-entry-photo-{{$entry.id}}"
+			onmouseover="if (typeof t{{$entry.id}} != 'undefined') clearTimeout(t{{$id}}); openMenu('contact-photo-menu-button-{{$entry.id}}')" 
+			onmouseout="t{{$entry.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$entry.id}}\'); closeMenu(\'contact-photo-menu-{{$entry.id}}\');',200)" >
+			<a href="{{$entry.url}}">
+				<img width="80" height="80" src="{{$entry.photo}}" alt="{{$entry.name}}" title="{{$entry.name}}[{{$entry.tags}}]" />
+			</a>
+			{{if $entry.photo_menu}}
+				<span onclick="openClose('contact-photo-menu-{{$entry.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$entry.id}}">menu</span>
+				<div class="contact-photo-menu" id="contact-photo-menu-{{$entry.id}}">
+					<ul>
+						{{foreach $entry.photo_menu as $k=>$c}}
+						{{if $c.2}}
+						<li><a class="{{$k}}" target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+						{{else}}
+						<li><a class="{{$k}}" href="{{$c.1}}">{{$c.0}}</a></li>
+						{{/if}}
+						{{/foreach}}
+					</ul>
+				</div>
+				{{/if}}
+		</div>
+		<div class="profile-match-break"></div>
+		<div class="profile-match-name">
+			<a href="{{$entry.url}}" title="{{$entry.name}}[{{$entry.tags}}]">{{$entry.name}}</a>
+		</div>
+		<div class="profile-match-end"></div>
+		{{if $entry.connlnk}}
+		<div class="profile-match-connect"><a href="{{$entry.connlnk}}" title="{{$entry.conntxt}}">{{$entry.conntxt}}</a></div>
+		{{/if}}
 
-</div>
+	</div>
+{{/foreach}}
+
+<div class="clear"></div>
+
+{{$paginate}}