diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php
index abf963a7b..116d6e02e 100644
--- a/e107_admin/cpage.php
+++ b/e107_admin/cpage.php
@@ -440,7 +440,7 @@ class page_admin_ui extends e_admin_ui
 		                               LEFT JOIN #user AS u ON p.page_author = u.user_id
 		                               LEFT JOIN #page_chapters AS pch ON p.page_chapter = pch.chapter_id
 		                               LEFT JOIN #page_chapters AS pbk ON pch.chapter_parent = pbk.chapter_id
-		                               WHERE p.page_title != '' "; // without any Order or Limit.
+		                               WHERE (p.page_title != '' OR p.page_text != '')   "; // without any Order or Limit.
 		//protected $editQry = "SELECT * FROM #comments WHERE comment_id = {ID}";
 		
 		protected $pid 				= "page_id";
diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index fce59e322..b8a778d5e 100644
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -4349,24 +4349,25 @@ class e_admin_ui extends e_admin_controller_ui
 
 			$form = e107::getAddon($plug, 'e_admin', $plug."_admin_form"); // class | false.
 
-			foreach($config['fields'] as $k=>$v)
+			if(!empty($config['fields']))
 			{
-				$v['data'] = false; // disable data-saving to db table. .
-
-				$fieldName = 'x_'.$plug.'_'.$k;
-
-				if($v['type'] == 'method' && method_exists($form,$fieldName))
+				foreach($config['fields'] as $k=>$v)
 				{
-					$v['method'] = $plug."_admin_form::".$fieldName;
-					//echo "Found method ".$fieldName." in ".$plug."_menu_form";
-					//echo $form->$fieldName();
+					$v['data'] = false; // disable data-saving to db table. .
+
+					$fieldName = 'x_'.$plug.'_'.$k;
+
+					if($v['type'] == 'method' && method_exists($form,$fieldName))
+					{
+						$v['method'] = $plug."_admin_form::".$fieldName;
+						//echo "Found method ".$fieldName." in ".$plug."_menu_form";
+						//echo $form->$fieldName();
+					}
+
+
+					$this->fields[$fieldName] = $v; // ie. x_plugin_key
+
 				}
-
-
-				$this->fields[$fieldName] = $v; // ie. x_plugin_key
-
-
-
 			}
 
 			if(!empty($config['batchOptions']))