diff --git a/include/ostatus.php b/include/ostatus.php
index c1b823329..05a1efaaa 100644
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -130,6 +130,14 @@ function ostatus_fetchauthor($xpath, $context, $importer, &$contact, $onlyfetch)
 	if ($r AND !$onlyfetch) {
 		// Update contact data
 
+		$value = $xpath->query("atom:link[@rel='salmon']", $context)->item(0)->nodeValue;
+		if ($value != "")
+			$contact["notify"] = $value;
+
+		$value = $xpath->evaluate('atom:author/uri/text()', $context)->item(0)->nodeValue;
+		if ($value != "")
+			$contact["alias"] = $value;
+
 		$value = $xpath->evaluate('atom:author/poco:displayName/text()', $context)->item(0)->nodeValue;
 		if ($value != "")
 			$contact["name"] = $value;
@@ -169,10 +177,9 @@ function ostatus_fetchauthor($xpath, $context, $importer, &$contact, $onlyfetch)
 		}
 
 		// @todo: Addr
-		update_gcontact(array("url" => $contact["url"], "network" => $contact["network"],
-				"photo" => $author["author-avatar"], "name" => $contact["name"],
-				"nick" => $contact["nick"], "location" => $contact["location"],
-				"about" => $contact["about"], "generation" => 2));
+		$contact["generation"] = 2;
+		$contact["photo"] = $author["author-avatar"];
+		update_gcontact($contact);
 	}
 
 	return($author);
diff --git a/mod/item.php b/mod/item.php
index 56c5ccad9..eba8296e7 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -1109,6 +1109,11 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
 		//get the person's name
 		$name = substr($tag,1);
 
+		// Sometimes the tag detection doesn't seem to work right
+		// This is some workaround
+		$nameparts = explode(" ", $name);
+		$name = $nameparts[0];
+
 		// Try to detect the contact in various ways
 		if ((strpos($name,'@')) || (strpos($name,'http://'))) {
 			// Is it in format @user@domain.tld or @http://domain.tld/...?
@@ -1146,8 +1151,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
 						dbesc(normalise_link($probed["url"])));
 				}
 			}
-		} elseif (!$r) {
-			$newname = str_replace('_',' ',$name);
+		} else {
 			$r = false;
 			if (strrpos($name,'+')) {
 				// Is it in format @nick+number?
@@ -1330,6 +1334,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
 			}
 		}
 */
+
 		//if there is an url for this persons profile
 		if(isset($profile)) {