diff --git a/mod/search.php b/mod/search.php
index 28d6c7697..426642141 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -203,9 +203,9 @@ function search_content(&$a,$update = 0, $load = false) {
 	}
 
 	if($tag) 
-		$o .= '<h2>' . sprintf( t('Items tagged with: %s'),htmlspecialchars($search, ENT_COMPAT,'UTF-8') . '</h2>';
+		$o .= '<h2>' . sprintf( t('Items tagged with: %s'),htmlspecialchars($search, ENT_COMPAT,'UTF-8')) . '</h2>';
 	else
-		$o .= '<h2>' . sprintf( t('Search results for: %s'),htmlspecialchars($search, ENT_COMPAT,'UTF-8') . '</h2>';
+		$o .= '<h2>' . sprintf( t('Search results for: %s'),htmlspecialchars($search, ENT_COMPAT,'UTF-8')) . '</h2>';
 
 	$o .= conversation($a,$items,'search',$update,'client');
 
diff --git a/mod/webfinger.php b/mod/webfinger.php
index 74bd2c954..a646961a8 100644
--- a/mod/webfinger.php
+++ b/mod/webfinger.php
@@ -14,10 +14,15 @@ function webfinger_content(&$a) {
 
 	if(x($_GET,'addr')) {
 		$addr = trim($_GET['addr']);
-		if(strpos($addr,'@' !== false))
-			$res = webfinger($addr);
-		else
-			$res = lrdd($addr);
+		if(strpos($addr,'@') !== false) {
+			$res = webfinger_rfc7033($addr);
+			if(! $res)
+				$res = old_webfinger($addr);
+		}
+		else {
+			if(function_exists('lrdd'))
+				$res = lrdd($addr);
+		}
 		$o .= '<pre>';
 		$o .= str_replace("\n",'<br />',print_r($res,true));
 		$o .= '</pre>';
diff --git a/mod/wfinger.php b/mod/wfinger.php
index bdec92b54..eba17de51 100644
--- a/mod/wfinger.php
+++ b/mod/wfinger.php
@@ -65,7 +65,7 @@ function wfinger_init(&$a) {
 
 		$result['aliases'] = array();
 
-		$result['properties'] = array('http://webfinger.example/ns/name' => $r[0]['channel_name']);
+		$result['properties'] = array('http://webfinger.net/ns/name' => $r[0]['channel_name']);
 
 		foreach($aliases as $alias) 
 			if($alias != $resource)
@@ -75,18 +75,18 @@ function wfinger_init(&$a) {
 		$result['links'] = array(
 
 			array(
-				'rel' => 'http://webfinger.example/rel/avatar',
+				'rel' => 'http://webfinger.net/rel/avatar',
 				'type' => $r[0]['xchan_photo_mimetype'],
 				'href' => $r[0]['xchan_photo_l']	
 			),
 
 			array(
-				'rel' => 'http://webfinger.example/rel/profile-page',
+				'rel' => 'http://webfinger.net/rel/profile-page',
 				'href' => z_root() . '/profile/' . $r[0]['channel_address'],
 			),
 
 			array(
-				'rel' => 'http://webfinger.example/rel/blog',
+				'rel' => 'http://webfinger.net/rel/blog',
 				'href' => z_root() . '/channel/' . $r[0]['channel_address'],
 			),