diff --git a/e107_handlers/admin_handler.php b/e107_handlers/admin_handler.php
index b5d4ea961..00c9a3060 100644
--- a/e107_handlers/admin_handler.php
+++ b/e107_handlers/admin_handler.php
@@ -2558,6 +2558,7 @@ class e_admin_ui extends e_admin_controller_ui
 				->setDataFields($this->dataFields)
 				->setParam('db_query', $this->editQry);
 		}
+		
 		return $this->_model;
 	}
 	
@@ -2757,7 +2758,7 @@ class e_admin_form_ui extends e_form
 			'head_query' => $request->buildQueryString('field=[FIELD]&asc=[ASC]&from=[FROM]', false), // without field, asc and from vars, REQUIRED
 			'np_query' => $request->buildQueryString(array(), false, 'from'), // without from var, REQUIRED for next/prev functionality
 			'legend' => $controller->getPluginTitle(), // hidden by default
-			'form_pre' => !$tree->isEmpty() ? $this->renderFilter($tp->post_toForm(array($controller->getQuery('searchquery'), $controller->getQuery('filter_options')), $controller->getModel().'/'.$controller->getAction())) : '',
+			'form_pre' => $this->renderFilter($tp->post_toForm(array($controller->getQuery('searchquery'), $controller->getQuery('filter_options')), $controller->getMode().'/'.$controller->getAction())), // needs to be visible when a search returns nothing
 			'form_post' => '', // markup to be added after closing form element
 			'fields' => $controller->getFields(), // see e_admin_ui::$fields
 			'fieldpref' => $controller->getFieldPref(), // see e_admin_ui::$fieldpref
@@ -2780,7 +2781,11 @@ class e_admin_form_ui extends e_form
 		{
 			$location = 'main/list'; //default location
 		}
-		$l = explode('/', $location);
+		$l = explode('/', $location); 
+		
+		//FIXME - this data is incorrect and always returns 'main/xxxx'. 
+		echo "Debug: LOCATION = ".$location; 
+		
 		$text = "
 			<form method='get' action='".e_SELF."?".e_QUERY."'>
 				<fieldset class='e-filter'>
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 4652cd154..22c8f92a0 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -9,8 +9,8 @@
  * Form Handler
  *
  * $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $
- * $Revision: 1.72 $
- * $Date: 2009-11-08 13:21:56 $
+ * $Revision: 1.73 $
+ * $Date: 2009-11-09 10:52:18 $
  * $Author: e107coders $
  *
 */
@@ -263,7 +263,8 @@ class e_form
 		return "<input type='password' name='{$name}' value='' maxlength='{$maxlength}'".$this->get_attributes($options, $name)." />";
 	}
 
-	function textarea($name, $value, $rows = 15, $cols = 40, $options = array())
+	//TODO make auto-expanding - like facebook. 
+	function textarea($name, $value, $rows = 10, $cols = 80, $options = array())
 	{
 		$options = $this->format_options('textarea', $name, $options);
 		//never allow id in format name-value for text fields
@@ -1179,7 +1180,7 @@ class e_form
 			break;
 			
 			case 'textarea':
-				return $this->textarea($key, $value, vartrue($parms['rows'], 15), vartrue($parms['cols'], 40), vartrue($parms['__options']));
+				return $this->textarea($key, $value, vartrue($parms['rows'], 5), vartrue($parms['cols'], 40), vartrue($parms['__options']));
 			break;
 			
 			case 'bbarea':