diff --git a/app/Lib/Tools/JSONConverterTool.php b/app/Lib/Tools/JSONConverterTool.php
index 77cc4956f..ee62b631b 100644
--- a/app/Lib/Tools/JSONConverterTool.php
+++ b/app/Lib/Tools/JSONConverterTool.php
@@ -1,7 +1,7 @@
 <?php
 class JSONConverterTool {
 	public function event2JSON($event, $isSiteAdmin=false) {
-		$toRearrange = array('Org', 'Orgc', 'SharingGroup', 'Attribute', 'ShadowAttribute', 'RelatedAttribute', 'RelatedEvent');
+		$toRearrange = array('Org', 'Orgc', 'SharingGroup', 'Attribute', 'ShadowAttribute', 'RelatedAttribute', 'RelatedEvent', 'Galaxy');
 		foreach ($toRearrange as $object) {
 			if (isset($event[$object])) {
 				$event['Event'][$object] = $event[$object];
diff --git a/app/Model/GalaxyCluster.php b/app/Model/GalaxyCluster.php
index d8a758dba..07be3c203 100644
--- a/app/Model/GalaxyCluster.php
+++ b/app/Model/GalaxyCluster.php
@@ -166,7 +166,7 @@ class GalaxyCluster extends AppModel{
 				if (substr($eventTag['Tag']['name'], 0, strlen('misp-galaxy:')) === 'misp-galaxy:') {
 					$cluster = $this->getCluster($eventTag['Tag']['name']);
 					if ($cluster) {
-						$events[$k]['GalaxyCluster'] = $cluster['GalaxyCluster'];
+						$events[$k]['GalaxyCluster'][] = $cluster['GalaxyCluster'];
 						if ($replace) {
 							unset($events[$k]['EventTag'][$k2]);
 						}
diff --git a/app/View/Elements/Events/eventIndexTable.ctp b/app/View/Elements/Events/eventIndexTable.ctp
index 70ba67b2e..15dd2c98d 100644
--- a/app/View/Elements/Events/eventIndexTable.ctp
+++ b/app/View/Elements/Events/eventIndexTable.ctp
@@ -23,6 +23,7 @@
 			endif;
 		?>
 		<th><?php echo $this->Paginator->sort('id');?></th>
+		<th>Clusters</th>
 		<?php if (Configure::read('MISP.tagging')): ?>
 			<th class="filter">Tags</th>
 		<?php endif; ?>
@@ -90,6 +91,36 @@
 		<td style="width:30px;">
 			<a href="<?php echo $baseurl."/events/view/".$event['Event']['id'] ?>"><?php echo $event['Event']['id'];?></a>
 		</td>
+		<td class="shortish">
+			<?php 
+				$clusterList = array();
+				$galaxyList = array();
+				$galaxy_id = 0;
+				if (isset($event['GalaxyCluster'])):
+					foreach ($event['GalaxyCluster'] as $cluster):
+						$galaxy_id = $cluster['Galaxy']['id'];
+						if (!isset($galaxyList[$cluster['Galaxy']['id']])) {
+							$galaxyList[$cluster['Galaxy']['id']] = $cluster['Galaxy']['name'];
+						}
+						$clusterList[$cluster['Galaxy']['id']][] = array('value' => $cluster['value'], 'id' => $cluster['id']);
+					endforeach;
+				endif;
+				foreach ($clusterList as $galaxy_id => $clusters):
+				?>
+					<span class="blue bold"><a href="<?php echo $baseurl; ?>/galaxies/view/<?php echo h($galaxy_id); ?>"><?php echo h($galaxyList[$galaxy_id]); ?></a>:</span>
+				<?php
+					foreach ($clusters as $cluster):
+					?>
+						<br />
+						<span class="blue">
+							&nbsp;&nbsp;&nbsp;&nbsp;
+							<a href="<?php echo $baseurl; ?>/galaxy_clusters/view/<?php echo h($cluster['id']); ?>"><?php echo h($cluster['value']); ?></a>
+						</span>
+					<?php
+					endforeach;
+				endforeach;
+			?>&nbsp;
+		</td>
 		<?php if (Configure::read('MISP.tagging')): ?>
 			<td style = "max-width: 200px;width:10px;">
 				<?php foreach ($event['EventTag'] as $tag):
diff --git a/app/View/Events/json/index.ctp b/app/View/Events/json/index.ctp
index e6ac98879..3bebece5c 100644
--- a/app/View/Events/json/index.ctp
+++ b/app/View/Events/json/index.ctp
@@ -5,6 +5,9 @@ foreach ($events as $key => $event) {
     unset($events[$key]['Event']);
     $events[$key]['Org'] = $event['Org'];
     $events[$key]['Orgc'] = $event['Orgc'];
+    if (isset($event['GalaxyCluster'])) {
+    	$events[$key]['GalaxyCluster'] = $event['GalaxyCluster'];
+    }
     if (isset($event['EventTag'])) $events[$key]['EventTag'] = $event['EventTag'];
     $events[$key]['SharingGroup'] = $event['SharingGroup'];