diff --git a/doc/Install.md b/doc/Install.md
index b5ab1ef6fb..d851624a7e 100644
--- a/doc/Install.md
+++ b/doc/Install.md
@@ -2,7 +2,7 @@ Friendika Installation
 
 We've tried very hard to ensure that Friendika will run on commodity hosting platforms - such as those used to host Wordpress blogs and Drupal websites. But be aware that Friendika is more than a simple web application. It is a complex communications system which more closely resembles an email server than a web server. For reliability and performance, messages are delivered in the background and are queued for later delivery when sites are down. This kind of functionality requires a bit more of the host system than the typical blog. Not every PHP/MySQL hosting provider will be able to support Friendika. Many will. But **please** review the requirements and confirm these with your hosting provider prior to installation.
 
-Also if you encounter installation issues, please let us know via the forums at http://groups.google.com/group/friendika or file an issue at http://bugs.friendika.com . Please be as clear as you can about your operating environment and provide as much detail as possible about any error messages you may see, so that we can prevent it from happening in the future. Due to the large variety of operating systems and PHP platforms in existence we may have only limited ability to debug your PHP installation or acquire any missing modules - but we will do our best to solve any general code issues.   
+Also if you encounter installation issues, please let us know via the forums at http://groups.google.com/group/friendika or file an issue at http://bugs.friendica.com . Please be as clear as you can about your operating environment and provide as much detail as possible about any error messages you may see, so that we can prevent it from happening in the future. Due to the large variety of operating systems and PHP platforms in existence we may have only limited ability to debug your PHP installation or acquire any missing modules - but we will do our best to solve any general code issues.   
 
 Before you begin: Choose a domain name or subdomain name for your server. Put some thought into this - because changing it after installation is currently not-supported. Things will break, and some of your friends may have difficulty communicating with you. We plan to address this limitation in a future release.
 
@@ -36,7 +36,7 @@ you might have trouble getting everything to work.]
 
     - If you are able to do so, we recommend using git to clone the source repository rather than to use a packaged tar or zip file. This makes the software much easier to update. The Linux command to clone the repository into a directory "mywebsite" would be 
 
-        `git clone https://github.com/friendika/Free-Friendika.git mywebsite`
+        `git clone https://github.com/friendica/friendica.git mywebsite`
 
     - and then you can pick up the latest changes at any time with
 
@@ -50,7 +50,7 @@ you might have trouble getting everything to work.]
             
         - Then you should clone the addon repository (separtely)
         
-            `git clone https://github.com/friendika/friendika-addons.git addon`
+            `git clone https://github.com/friendica/friendica-addons.git addon`
             
         - For keeping the addon tree updated, you should be on you addon tree and issue a git pull
         
diff --git a/mod/item.php b/mod/item.php
index a03a857754..ee3bdca992 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -415,9 +415,11 @@ function item_post(&$a) {
 					$newname = $name;
 					$alias = '';
 					$tagcid = 0;
-					if(strrpos($newname,'+'))
+					if(strrpos($newname,'+')) {
 						$tagcid = intval(substr($newname,strrpos($newname,'+') + 1));
-
+						if(strpos($name,' '))
+							$name = substr($name,0,strpos($name,' '));
+					}	
 					if($tagcid) {
 						$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 							intval($tagcid),