diff --git a/app/Model/Server.php b/app/Model/Server.php
index ade90711a..0e145aff2 100755
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -2048,10 +2048,10 @@ class Server extends AppModel {
 				return 1;
 			}
 			if (!empty($events)) foreach ($events as &$event) {
-				$event = array('Event' => $event);
-				if (!isset($event['Orgc'])) $event['Orgc']['name'] = $event['Event']['orgc'];
-				if (!isset($event['Org'])) $event['Org']['name'] = $event['Event']['org'];
+				if (!isset($event['Orgc'])) $event['Orgc']['name'] = $event['orgc'];
+				if (!isset($event['Org'])) $event['Org']['name'] = $event['org'];
 				if (!isset($event['EventTag'])) $event['EventTag'] = array();
+				$event = array('Event' => $event);
 			} else return 3;
 			return $events;
 		}
@@ -2086,9 +2086,11 @@ class Server extends AppModel {
 			} catch (Exception $e) {
 				return 1;
 			}
-			if (!isset($event['Orgc'])) $event['Orgc']['name'] = $event['Event']['orgc'];
-			if (!isset($event['Org'])) $event['Org']['name'] = $event['Event']['org'];
-			if (!isset($event['EventTag'])) $event['EventTag'] = array();
+			if (!isset($event['Event']['Orgc'])) $event['Event']['Orgc']['name'] = $event['Event']['orgc'];
+			if (isset($event['Event']['Orgc'][0])) $event['Event']['Orgc'] = $event['Event']['Orgc'][0];
+			if (!isset($event['Event']['Org'])) $event['Event']['Org']['name'] = $event['Event']['org'];
+			if (isset($event['Event']['Org'][0])) $event['Event']['Org'] = $event['Event']['Org'][0];
+			if (!isset($event['Event']['EventTag'])) $event['Event']['EventTag'] = array();
 			return $event;
 		}
 		return 2;
diff --git a/app/View/Servers/preview_index.ctp b/app/View/Servers/preview_index.ctp
index efbffacb8..9703f7f04 100644
--- a/app/View/Servers/preview_index.ctp
+++ b/app/View/Servers/preview_index.ctp
@@ -95,13 +95,13 @@
 			</td>
 			<td class="short" ondblclick="document.location.href ='<?php echo $eventViewURL . h($event['Event']['id']);?>'">
 				<?php
-					echo h($event['Orgc']['name']);
+					echo h($event['Event']['Orgc']['name']);
 				?>
 				&nbsp;
 			</td>
 			<td class="short" ondblclick="document.location.href ='<?php echo $eventViewURL . h($event['Event']['id']);?>'">
 				<?php
-					echo h($event['Org']['name']);
+					echo h($event['Event']['Org']['name']);
 				?>
 				&nbsp;
 			</td>
@@ -110,7 +110,7 @@
 			</td>
 			<?php if (Configure::read('MISP.tagging')): ?>
 			<td style = "max-width: 200px;width:10px;">
-				<?php foreach ($event['EventTag'] as $tag):
+				<?php foreach ($event['Event']['EventTag'] as $tag):
 					$tagText = "&nbsp;";
 					if (Configure::read('MISP.full_tags_on_event_index')) $tagText = $tag['Tag']['name'];
 				?>