diff --git a/boot.php b/boot.php
index 99229972eb..eeef666ae9 100644
--- a/boot.php
+++ b/boot.php
@@ -1523,20 +1523,20 @@ function login($register = false, $hiddens=false) {
 
 	$o .= replace_macros($tpl, array(
 
-		'$dest_url'     => $dest_url,
-		'$logout'       => t('Logout'),
-		'$login'        => t('Login'),
+		'$dest_url'	=> $dest_url,
+		'$logout'	=> t('Logout'),
+		'$login'	=> t('Login'),
 
-		'$lname'	 	=> array('username', t('Nickname or Email address: ') , '', ''),
+		'$lname'	=> array('username', t('Nickname or Email: ') , '', ''),
 		'$lpassword' 	=> array('password', t('Password: '), '', ''),
 		'$lremember'	=> array('remember', t('Remember me'), 0,  ''),
 
-		'$openid'		=> !$noid,
-		'$lopenid'      => array('openid_url', t('Or login using OpenID: '),'',''),
+		'$openid'	=> !$noid,
+		'$lopenid'	=> array('openid_url', t('Or login using OpenID: '),'',''),
 
-		'$hiddens'      => $hiddens,
+		'$hiddens'	=> $hiddens,
 
-		'$register'     => $reg,
+		'$register'	=> $reg,
 
 		'$lostpass'     => t('Forgot your password?'),
 		'$lostlink'     => t('Password Reset'),
diff --git a/mod/network.php b/mod/network.php
index 95efc36260..2dc63edb45 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -143,7 +143,7 @@ function network_init(&$a) {
 	// search terms header
 	if(x($_GET,'search')) {
 		$a->page['content'] .= replace_macros(get_markup_template("section_title.tpl"),array(
-			'$title' => sprintf( t('Search Results For: %s'), $search)
+			'$title' => sprintf( t('Results for: %s'), $search)
 		));
 	}
 
diff --git a/mod/search.php b/mod/search.php
index fd8a9eb64b..91c345b929 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -61,7 +61,7 @@ function search_init(&$a) {
 			}
 		}
 		if(x($_GET,'remove') && $search) {
-			q("delete from `search` where `uid` = %d and `term` = '%s' limit 1",
+			q("DELETE FROM `search` WHERE `uid` = %d AND `term` = '%s' LIMIT 1",
 				intval(local_user()),
 				dbesc($search)
 			);
@@ -234,7 +234,7 @@ function search_content(&$a) {
 	if($tag)
 		$title = sprintf( t('Items tagged with: %s'), $search);
 	else
-		$title = sprintf( t('Search results for: %s'), $search);
+		$title = sprintf( t('Results for: %s'), $search);
 
 	$o .= replace_macros(get_markup_template("section_title.tpl"),array(
 		'$title' => $title