diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php
index 3ce719dd55..65d970dd15 100644
--- a/actions/peoplesearch.php
+++ b/actions/peoplesearch.php
@@ -81,8 +81,6 @@ class PeoplesearchAction extends SearchAction
 
         } else {
             $this->element('p', 'error', _('No results.'));
-
-//TODO
             $this->searchSuggestions($q);
             $profile->free();
         }
diff --git a/lib/searchaction.php b/lib/searchaction.php
index 697262ccdb..918f8dd9af 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -146,8 +146,8 @@ You can also try your search on other engines:
 
 * [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=identi.ca)
 * [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)
-* [Google](http://www.google.com/search?q=site%%3Aidenti.ca+%s)
-* [Yahoo](http://search.yahoo.com/search?p=site%%3Aidenti.ca+%s)
+* [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)
+* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)
 
 
 E_O_T