diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php
index 0084e37e..ce6a24c9 100755
--- a/code/ReportAdmin.php
+++ b/code/ReportAdmin.php
@@ -92,7 +92,7 @@ class ReportAdmin extends LeftAndMain {
 	 * @return unknown
 	 */
 	protected function showWithEditForm($params, $editForm) {
-		if(isset($params['ID'])) Session::set('currentPage', $params['ID']);
+		if(isset($params['ID'])) Session::set('currentReport', $params['ID']);
 		if(isset($params['OtherID'])) Session::set('currentOtherID', $params['OtherID']);
 		
 		if(Director::is_ajax()) {
@@ -116,7 +116,7 @@ class ReportAdmin extends LeftAndMain {
 	 * @return Form
 	 */
 	public function EditForm() {
-		$id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : Session::get('currentPage');
+		$id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : Session::get('currentReport');
 		
 		if($id) {
 			foreach($this->Reports() as $report) {
@@ -142,10 +142,9 @@ class ReportAdmin extends LeftAndMain {
 		$fields = new FieldSet();
 		$actions = new FieldSet();
 		
-		if(is_numeric($id)) $page = DataObject::get_by_id('SiteTree', $id);
-		$reportClass = is_object($page) ? 'SS_Report_' . $page->ClassName : $id;
-		
-		$obj = new $reportClass();
+		$reports = SSReport::get_reports('ReportAdmin');
+		$obj = $reports[$id];
+
 		if($obj) $fields = $obj->getCMSFields();
 		if($obj) $actions = $obj->getCMSActions();
 		
diff --git a/templates/ReportAdminForm.ss b/templates/ReportAdminForm.ss
index f342bb0f..41e208e8 100644
--- a/templates/ReportAdminForm.ss
+++ b/templates/ReportAdminForm.ss
@@ -11,6 +11,7 @@
 		
 			<!-- Filters -->
 			
+			<% if FieldMap.Filters.Children %>
 			<div style="border-bottom: 1px #AAA solid"><b>Filter by</b></div>
 			
 			<% control FieldMap.Filters %>
@@ -24,10 +25,13 @@
 			
 			<div id="action_updatereport" style="float: left; margin: 1px 10px 10px 0">
 			<br />
+			<% if FieldMap.action_updatereport %>
 			$FieldMap.action_updatereport.Field
+			<% end_if %>
 			</div>
 			
 			<div style="clear: both">&nbsp;</div>
+			<% end_if %>
 			
 			$FieldMap.ReportContent.FieldHolder