diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php
index a7c5276c0..08a279062 100644
--- a/e107_admin/newspost.php
+++ b/e107_admin/newspost.php
@@ -9,8 +9,8 @@
  * News Administration
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/newspost.php,v $
- * $Revision: 1.22 $
- * $Date: 2009-01-16 17:57:56 $
+ * $Revision: 1.23 $
+ * $Date: 2009-01-17 01:30:35 $
  * $Author: secretr $
 */
 require_once("../class2.php");
@@ -480,13 +480,13 @@ class admin_newspost
 
 		$e107 = &e107::getInstance();
 
-		if (isset($_POST['searchquery']))
+		if (varsettrue($_POST['searchquery']))
 		{
-		$query = "news_title REGEXP('".$_POST['searchquery']."') OR news_body REGEXP('".$_POST['searchquery']."') OR news_extended REGEXP('".$_POST['searchquery']."') ORDER BY news_datestamp DESC";
+			$query = "news_title REGEXP('".$_POST['searchquery']."') OR news_body REGEXP('".$_POST['searchquery']."') OR news_extended REGEXP('".$_POST['searchquery']."') ORDER BY news_datestamp DESC";
 		}
 		else
 		{
-		$query = "ORDER BY ".($this->getSubAction() ? $this->getSubAction() : "news_datestamp")." ".strtoupper($sort_order)."  LIMIT ".$this->getFrom().", {$amount}";
+			$query = "ORDER BY ".($this->getSubAction() ? $this->getSubAction() : "news_datestamp")." ".strtoupper($sort_order)."  LIMIT ".$this->getFrom().", {$amount}";
 		}
 
 		if ($e107->sql->db_Select('news', '*', $query, ($_POST['searchquery'] ? 0 : "nowhere")))
@@ -551,7 +551,7 @@ class admin_newspost
 		}
 		else
 		{
-			$text .= "<div class='center'>".NWSLAN_43."</div>";
+			$text .= "<div class='center'>".isset($_POST['searchquery']) ? sprintf(NWSLAN_121, '<em>&quot;'.$_POST['searchquery'])."&quot;</em> <a href='".e_SELF."'>&laquo; ".LAN_BACK."</a>" : NWSLAN_43."</div>";
 		}
 
 		$newsposts = $e107->sql->db_Count('news');
@@ -842,10 +842,11 @@ class admin_newspost
 												".$frm->file('file_userfile[]')."
 												".$frm->select_open('uploadtype[]')."
 			";
+			
 			for ($i=0; $i<count($up_value); $i++)
 			{
 				$text .= $frm->option($up_name[$i], $up_value[$i], varset($_POST['uploadtype']) == $up_value[$i]);
-			};
+			}
 			//FIXME - upload shortcode, flexible enough to be used everywhere
 			$text .= "
 												</select>
@@ -1098,7 +1099,7 @@ class admin_newspost
 		";
 
 		$emessage = &eMessage::getInstance();
-		$e107->ns->tablerender(NWSLAN_29, $emessage->render().$text);
+		$e107->ns->tablerender($this->getSubAction() == 'edit' ? NWSLAN_29a : NWSLAN_29, $emessage->render().$text);
 	}
 
 
diff --git a/e107_languages/English/admin/lan_newspost.php b/e107_languages/English/admin/lan_newspost.php
index 90dab4da2..07d6acd11 100644
--- a/e107_languages/English/admin/lan_newspost.php
+++ b/e107_languages/English/admin/lan_newspost.php
@@ -4,15 +4,15 @@
 |     e107 website system - Language File.
 |
 |     $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_newspost.php,v $
-|     $Revision: 1.6 $
-|     $Date: 2009-01-16 17:57:56 $
+|     $Revision: 1.7 $
+|     $Date: 2009-01-17 01:30:35 $
 |     $Author: secretr $
 +----------------------------------------------------------------------------+
 */
 define("NWSLAN_1", "News story deleted.");
 define("NWSLAN_2", "Please tick the confirm box to delete this news item.");
 define("NWSLAN_3", "No news items yet.");
-define("NWSLAN_4", "Existing News");
+define("NWSLAN_4", "News - Existing News");
 define("NWSLAN_5", "Open HTML Editor");
 define("NWSLAN_6", "Category");
 
@@ -36,7 +36,8 @@ define("NWSLAN_25", "Update news in database");
 define("NWSLAN_26", "Post news to database");
 define("NWSLAN_27", "Preview");
 
-define("NWSLAN_29", "News Post");
+define("NWSLAN_29", "News - Add New Item");
+define("NWSLAN_29a", "News - Update Existing Item");
 
 define("NWSLAN_31", "News item");
 define("NWSLAN_32", "deleted");
@@ -118,6 +119,7 @@ define("NWSLAN_117", "set the title for the news archive");
 // define("NWSLAN_118", "View Images"); already defined above.
 define("NWSLAN_119", "Settings Saved");
 define("NWSLAN_120", "Text to show at the top of Submit News");
+define("NWSLAN_121", "Nothing found for %s");
 
 define("LAN_NEWS_5", "Error! - Was unable to update news item into database!");
 define("LAN_NEWS_6", "News entered into database.");
@@ -139,7 +141,7 @@ define("LAN_NEWS_22", "Thumbnail");
 define("LAN_NEWS_23", "Choose an image for this news item");
 define("LAN_NEWS_24", "Image + Auto-Thumbnail");
 define("LAN_NEWS_25", "Auto-Thumbnail size");
-define("LAN_NEWS_26", "add new upload");
+define("LAN_NEWS_26", "add new upload field");
 define("LAN_NEWS_27", "Summary");
 
 define("LAN_NEWS_28", "Sticky");
@@ -173,4 +175,6 @@ define("LAN_NEWS_51", "Modification of the news-item author can be done by:");
 define("LAN_NEWS_52", "General Information");
 define("LAN_NEWS_53", "Advanced Options");
 define("LAN_NEWS_54", "stay in edit mode");
+
+
 ?>