diff --git a/admin/panels/entry/admin.entry.list.php b/admin/panels/entry/admin.entry.list.php
index 7462b99..873b16e 100755
--- a/admin/panels/entry/admin.entry.list.php
+++ b/admin/panels/entry/admin.entry.list.php
@@ -64,7 +64,8 @@
 			$params['count'] = isset($_REQUEST['count'])? $_REQUEST['count'] : $defcount;
 			$params['page'] = isset($_REQUEST['paged'])? $_REQUEST['paged'] : 1; 
 			isset($_REQUEST['category'])? $params['category'] = $_REQUEST['category'] : $params['category'] = 'all';
-			$params['fullparse']=true;
+			$params['fullparse']=false;
+			$params['comments']=true;
 			$fpdb->query($params);
 			
 			return 0;
diff --git a/admin/panels/entry/admin.entry.list.tpl b/admin/panels/entry/admin.entry.list.tpl
index a140509..386ad5e 100755
--- a/admin/panels/entry/admin.entry.list.tpl
+++ b/admin/panels/entry/admin.entry.list.tpl
@@ -45,13 +45,13 @@
 <thead><tr>{*<th>{$panelstrings.sel}</th>*}
 <th>{$panelstrings.date}</th>
 <th class="main-cell">{$panelstrings.title}</th>
-<th>{$panelstrings.author}</th>
+<!-- <th>{$panelstrings.author}</th> -->
 <th>{$panelstrings.comms}</th>
 <th>{$panelstrings.action}</th></tr></thead>
 <tbody>
 {entry}
 <tr>
-<td>{$date|date_format:"%D, %T"}</td>
+<td>{$id|entry_idtotime|date_format:"%D, %T"}</td>
 <td class="main-cell">
 {if in_array('draft',$categories)}
 (<em class="entry-flag">{$lang.entry.flags.short.draft}</em>)
@@ -61,7 +61,7 @@ href="{$panel_url|action_link:write}&amp;entry={$id}">
 {$subject|truncate:70} 
 </a>
 </td>
-<td>{$author}</td>
+<!-- <td>{$author}</td> -->
 <td><a class="link-general" 
 href="{$panel_url|action_link:commentlist}&amp;entry={$id}">
 {* Compatibility with pre-0.702 *}
diff --git a/fp-includes/core/core.comment.php b/fp-includes/core/core.comment.php
index 06a74c8..0599f0f 100755
--- a/fp-includes/core/core.comment.php
+++ b/fp-includes/core/core.comment.php
@@ -151,4 +151,4 @@
 	
 
 	
-?>
\ No newline at end of file
+?>
diff --git a/fp-includes/core/core.entry.php b/fp-includes/core/core.entry.php
index 24fbb0b..f1f88a9 100755
--- a/fp-includes/core/core.entry.php
+++ b/fp-includes/core/core.entry.php
@@ -359,6 +359,11 @@
 		return date('ymdHis', $time);
 	}
 
+	function entry_idtotime($id) {
+		$date = date_from_id($id);
+		return $date['time'];
+	}
+
 	function entry_list() {
 
 		trigger_error('function deprecated', E_USER_ERROR);
diff --git a/fp-includes/core/core.filesystem.php b/fp-includes/core/core.filesystem.php
index 502734f..48e4c7d 100755
--- a/fp-includes/core/core.filesystem.php
+++ b/fp-includes/core/core.filesystem.php
@@ -74,7 +74,13 @@
 			//$this->_listFiles($this->_directory);
 			return $this->_list;
 		}
-		
+
+		function count() {
+			if (!isset ($this->count))
+				$this->count = count($this->_list);
+			return $this->count;
+		}
+
 	}
 	
 	class fs_pathlister extends fs_filelister {
diff --git a/fp-includes/core/core.fpdb.class.php b/fp-includes/core/core.fpdb.class.php
index a0733d6..c2bb36a 100644
--- a/fp-includes/core/core.fpdb.class.php
+++ b/fp-includes/core/core.fpdb.class.php
@@ -50,11 +50,16 @@
 			}
 			
 			if (isset($params['fullparse'])) {
+
 				$this->fullparse = 
 						is_string($params['fullparse'])?
 						($params['fullparse'] != 'false')
 						:
 						$params['fullparse'];
+
+				if ($this->fullparse)
+					$this->comments = true;
+
 			}
 			
 		
@@ -105,6 +110,10 @@
 			if (isset($params['category'])) {
 				$this->category = intval($params['category']);
 			}			
+
+			if (isset($params['comments'])) {
+				$this->comments = true;
+			}
 			
 		}
 		
@@ -350,12 +359,6 @@
 				
 				$cont = entry_parse($id);
 
-				if ($cont) {
-					$this->comments =& new FPDB_CommentList($id, comment_getlist($id));
-				
-					$cont['comments'] = $this->comments->getCount();
-			
-				}
 				
 			} else {
 
@@ -363,10 +366,17 @@
 				$cont = array('subject' => $this->walker->current_value());
 				
 			}
+
+			if (!$cont) {
+				return false;
+			}
 			
+			if ($qp->comments) {
+				$this->comments =& new FPDB_CommentList($id, comment_getlist($id));
+				$cont['comments'] = $this->comments->getCount();
+			}
 			
-			
-			$post = $cont;
+			$post =& $cont;
 			$post['id'] = $id;
 
 			$var = array(&$id, &$cont);