diff --git a/app/Model/Server.php b/app/Model/Server.php
index 1bdcc341d..f3a76e7dc 100755
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -401,8 +401,9 @@ class Server extends AppModel {
 							'description' =>'Show the full tag names on the event index.',
 							'value' => '',
 							'errorMessage' => '',
-							'test' => 'testBool',
-							'type' => 'boolean',
+							'test' => 'testForEmpty',
+							'type' => 'string',
+							'options' => array(0 => 'Minimal tags', 1 => 'Full tags', 2 => 'Shortened tags'),
 					),
 					'welcome_text_top' => array(
 							'level' => 2,
diff --git a/app/View/Events/index.ctp b/app/View/Events/index.ctp
index b812e81f9..02033c779 100755
--- a/app/View/Events/index.ctp
+++ b/app/View/Events/index.ctp
@@ -136,7 +136,14 @@
 			<td style = "max-width: 200px;width:10px;">
 				<?php foreach ($event['EventTag'] as $tag):
 					$tagText = "&nbsp;";
-					if (Configure::read('MISP.full_tags_on_event_index')) $tagText = h($tag['Tag']['name']);
+					if (Configure::read('MISP.full_tags_on_event_index') == 1) $tagText = h($tag['Tag']['name']);
+					else if (Configure::read('MISP.full_tags_on_event_index') == 2) {
+						if (strpos($tag['Tag']['name'], '=')) {
+							$tagText = explode('=', $tag['Tag']['name']);
+							$tagText = h(trim(end($tagText), "\""));
+						}
+						else $tagText = h($tag['Tag']['name']);
+					}
 				?>
 					<span class="tag useCursorPointer" style="margin-bottom:3px;background-color:<?php echo h($tag['Tag']['colour']);?>;color:<?php echo $this->TextColour->getTextColour($tag['Tag']['colour']);?>;" title="<?php echo h($tag['Tag']['name']); ?>" onClick="document.location.href='<?php echo $baseurl; ?>/events/index/searchtag:<?php echo h($tag['Tag']['id']);?>';"><?php echo $tagText; ?></span>
 				<?php endforeach; ?>
diff --git a/app/View/Servers/preview_index.ctp b/app/View/Servers/preview_index.ctp
index 16832ad9c..37dc99175 100644
--- a/app/View/Servers/preview_index.ctp
+++ b/app/View/Servers/preview_index.ctp
@@ -112,7 +112,14 @@
 			<td style = "max-width: 200px;width:10px;">
 				<?php foreach ($event['Event']['EventTag'] as $tag):
 					$tagText = "&nbsp;";
-					if (Configure::read('MISP.full_tags_on_event_index')) $tagText = $tag['Tag']['name'];
+					if (Configure::read('MISP.full_tags_on_event_index') == 1) $tagText = h($tag['Tag']['name']);
+					else if (Configure::read('MISP.full_tags_on_event_index') == 2) {
+						if (strpos($tag['Tag']['name'], '=')) {
+							$tagText = explode('=', $tag['Tag']['name']);
+							$tagText = h(trim(end($tagText), "\""));
+						}
+						else $tagText = h($tag['Tag']['name']);
+					}
 				?>
 					<span class=tag style="margin-bottom:3px;background-color:<?php echo h($tag['Tag']['colour']);?>;color:<?php echo $this->TextColour->getTextColour($tag['Tag']['colour']);?>;" title="<?php echo h($tag['Tag']['name']); ?>"><?php echo h($tagText); ?></span>
 				<?php endforeach; ?>