diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php
index 0a00abb28..51543f0a6 100644
--- a/app/Model/Attribute.php
+++ b/app/Model/Attribute.php
@@ -936,13 +936,15 @@ class Attribute extends AppModel
 
     public function validCategory($fields)
     {
-        $validCategories = array_keys($this->categoryDefinitions);
-        if (in_array($fields['category'], $validCategories)) {
-            return true;
-        }
-        return false;
+        return isset($this->categoryDefinitions[$fields['category']]);
     }
 
+    /**
+     * Check if the attribute already exists in the same event.
+     *
+     * @param array $fields
+     * @return bool
+     */
     public function valueIsUnique($fields)
     {
         if (isset($this->data['Attribute']['deleted']) && $this->data['Attribute']['deleted']) {
@@ -952,31 +954,28 @@ class Attribute extends AppModel
         if (!empty($this->data['Attribute']['object_relation'])) {
             return true;
         }
-        $value = $fields['value'];
-        if (strpos($value, '|')) {
-            $value = explode('|', $value);
-            $value = array(
-                'Attribute.value1' => $value[0],
-                'Attribute.value2' => $value[1]
-            );
-        } else {
-            $value = array(
-                'Attribute.value1' => $value,
-            );
-        }
-        $eventId = $this->data['Attribute']['event_id'];
-        $type = $this->data['Attribute']['type'];
-        $category = $this->data['Attribute']['category'];
 
-        // check if the attribute already exists in the same event
+        $eventId = $this->data['Attribute']['event_id'];
+        $category = $this->data['Attribute']['category'];
+        $type = $this->data['Attribute']['type'];
+
         $conditions = array(
             'Attribute.event_id' => $eventId,
             'Attribute.type' => $type,
             'Attribute.category' => $category,
             'Attribute.deleted' => 0,
-            'Attribute.object_id' => 0
+            'Attribute.object_id' => 0,
         );
-        $conditions = array_merge($conditions, $value);
+
+        $value = $fields['value'];
+        if (in_array($type, $this->getCompositeTypes())) {
+            $value = explode('|', $value);
+            $conditions['Attribute.value1'] = $value[0];
+            $conditions['Attribute.value2'] = $value[1];
+        } else {
+            $conditions['Attribute.value1'] = $value;
+        }
+
         if (isset($this->data['Attribute']['id'])) {
             $conditions['Attribute.id !='] = $this->data['Attribute']['id'];
         }
@@ -1626,14 +1625,17 @@ class Attribute extends AppModel
 
     public function getCompositeTypes()
     {
-        // build the list of composite Attribute.type dynamically by checking if type contains a |
-        // default composite types
-        $compositeTypes = array('malware-sample');  // TODO hardcoded composite
-        // dynamically generated list
-        foreach (array_keys($this->typeDefinitions) as $type) {
-            $pieces = explode('|', $type);
-            if (2 == count($pieces)) {
-                $compositeTypes[] = $type;
+        static $compositeTypes;
+
+        if ($compositeTypes === null) {
+            // build the list of composite Attribute.type dynamically by checking if type contains a |
+            // default composite types
+            $compositeTypes = array('malware-sample');  // TODO hardcoded composite
+            // dynamically generated list
+            foreach ($this->typeDefinitions as $type => $foo) {
+                if (strpos($type, '|') !== false) {
+                    $compositeTypes[] = $type;
+                }
             }
         }
         return $compositeTypes;
diff --git a/app/Model/Event.php b/app/Model/Event.php
index 0fa6941ab..e25181044 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -3779,7 +3779,8 @@ class Event extends AppModel
                     'Server.name',
                     'Server.id',
                     'Server.unpublish_event',
-                    'Server.publish_without_email'
+                    'Server.publish_without_email',
+                    'Server.internal',
                 )
             ));
         } else {
diff --git a/app/View/Attributes/add.ctp b/app/View/Attributes/add.ctp
index 43dc78570..24a5c155e 100644
--- a/app/View/Attributes/add.ctp
+++ b/app/View/Attributes/add.ctp
@@ -91,30 +91,17 @@
         )
     ));
     if (!$ajax) {
-        echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event-collection', 'menuItem' => $this->action === 'add' ? 'add' : 'editEvent'));
+        $event = ['Event' => ['id' => $event_id, 'published' => $published ]];
+        echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event', 'menuItem' => 'addAttribute', 'event' => $event));
     }
 ?>
 
 <script type="text/javascript">
     var notice_list_triggers = <?php echo $notice_list_triggers; ?>;
     var composite_types = <?php echo json_encode($compositeTypes); ?>;
-    var category_type_mapping = new Array();
-
-    <?php
-    foreach ($categoryDefinitions as $category => $def) {
-        echo "category_type_mapping['" . addslashes($category) . "'] = {";
-        $first = true;
-        foreach ($def['types'] as $type) {
-            if ($first) {
-                $first = false;
-            } else {
-                echo ', ';
-            }
-            echo "'" . addslashes($type) . "' : '" . addslashes($type) . "'";
-        }
-        echo "}; \n";
-    }
-    ?>
+    var category_type_mapping = <?php echo json_encode(array_map(function($value) {
+        return array_combine($value['types'], $value['types']);
+    }, $categoryDefinitions)); ?>;
 
     $('#AttributeDistribution').change(function() {
         checkSharingGroup('Attribute');
@@ -133,7 +120,7 @@
         checkNoticeList('attribute');
     });
 
-    $(document).ready(function() {
+    $(function() {
         <?php
             if ($action == 'edit'):
         ?>
@@ -143,7 +130,7 @@
         ?>
         checkSharingGroup('Attribute');
 
-        var $form = $('#AttributeType').closest('form').submit(function( event ) {
+        $('#AttributeType').closest('form').submit(function( event ) {
             if ($('#AttributeType').val() === 'datetime') {
                 // add timezone of the browser if not set
                 var allowLocalTZ = true;
@@ -153,7 +140,7 @@
                     if (dateValue.creationData().format !== "YYYY-MM-DDTHH:mm:ssZ" && dateValue.creationData().format !== "YYYY-MM-DDTHH:mm:ss.SSSSZ") {
                         // Missing timezone data
                         var confirm_message = '<?php echo __('Timezone missing, auto-detected as: ') ?>' + dateValue.format('Z')
-                        confirm_message += '<?php echo '\r\n' . __('The following value will be submited instead: '); ?>' + dateValue.toISOString(allowLocalTZ)
+                        confirm_message += '<?php echo '\r\n' . __('The following value will be submitted instead: '); ?>' + dateValue.toISOString(allowLocalTZ)
                         if (confirm(confirm_message)) {
                             $valueInput.val(dateValue.toISOString(allowLocalTZ));
                         } else {
@@ -161,7 +148,7 @@
                         }
                     }
                 } else {
-                    textStatus = '<?php echo __('Value is not a valid datetime. Excpected format YYYY-MM-DDTHH:mm:ssZ') ?>'
+                    textStatus = '<?php echo __('Value is not a valid datetime. Expected format YYYY-MM-DDTHH:mm:ssZ') ?>'
                     showMessage('fail', textStatus);
                     return false;
                 }
diff --git a/app/View/Attributes/edit.ctp b/app/View/Attributes/edit.ctp
deleted file mode 100644
index 76e06017f..000000000
--- a/app/View/Attributes/edit.ctp
+++ /dev/null
@@ -1,147 +0,0 @@
-<div class="attributes <?php if (!isset($ajax) || !$ajax) echo 'form';?>">
-<?php echo $this->Form->create('Attribute');?>
-    <fieldset>
-        <legend><?php echo __('Edit Attribute'); ?></legend>
-        <?php
-            echo $this->Form->hidden('event_id');
-            echo $this->Form->input('category', array(
-                'empty' => __('(choose one)'),
-                'label' => __('Category ') . $this->element('formInfo', array('type' => 'category'))
-            ));
-            $typeInputData = array(
-                'empty' => __('(first choose category)'),
-                'label' => __('Type ') . $this->element('formInfo', array('type' => 'type')),
-            );
-            if ($objectAttribute) {
-                $typeInputData[] = __('disabled');
-            }
-            echo $this->Form->input('type', $typeInputData);
-        ?>
-            <div class="input clear"></div>
-        <?php
-            echo $this->Form->input('distribution', array(
-                'options' => array($distributionLevels),
-                'label' => __('Distribution ') . $this->element('formInfo', array('type' => 'distribution'))
-            ));
-        ?>
-            <div id="SGContainer" style="display:none;">
-        <?php
-            if (!empty($sharingGroups)) {
-                echo $this->Form->input('sharing_group_id', array(
-                        'options' => array($sharingGroups),
-                        'label' => __('Sharing Group'),
-                    ));
-            }
-        ?>
-        </div>
-        <?php
-            echo $this->Form->input('value', array(
-                    'type' => 'textarea',
-                    'error' => array('escape' => false),
-                    'div' => 'input clear',
-                    'class' => 'input-xxlarge'
-            ));
-            echo $this->Form->input('comment', array(
-                    'type' => 'text',
-                    'label' => __('Contextual Comment'),
-                    'error' => array('escape' => false),
-                    'div' => 'input clear',
-                    'class' => 'input-xxlarge'
-            ));
-        ?>
-        <div class="input clear"></div>
-        <?php
-            echo $this->Form->input('to_ids', array(
-                    'label' => __('for Intrusion Detection System'),
-            ));
-            if (!$objectAttribute) {
-                echo $this->Form->input('batch_import', array(
-                        'type' => 'checkbox',
-                ));
-            }
-            echo '<div class="input clear"></div>';
-            echo $this->Form->input('disable_correlation', array(
-                    'type' => 'checkbox'
-            ));
-        ?>
-    </fieldset>
-        <p style="color:red;font-weight:bold;display:none;<?php if (isset($ajax) && $ajax) echo "text-align:center;";?> " id="warning-message"><?php echo __('Warning: You are about to share data that is of a sensitive nature (Attribution / targeting data). Make sure that you are authorised to share this.'); ?></p>
-<?php
-    echo $this->Form->button('Submit', array('class' => 'btn btn-primary'));
-    echo $this->Form->end();
-?>
-</div>
-<?php
-    if (!$ajax) {
-        $event['Event']['id'] = $this->request->data['Attribute']['event_id'];
-        $event['Event']['published'] = $published;
-        echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event', 'menuItem' => 'addAttribute', 'event' => $event));
-    }
-?>
-<script type="text/javascript">
-var fieldsArray = new Array('AttributeCategory', 'AttributeType', 'AttributeValue', 'AttributeDistribution', 'AttributeComment', 'AttributeToIds', 'AttributeBatchImport', 'AttributeSharingGroupId');
-<?php
-    $formInfoTypes = array('distribution' => 'Distribution', 'category' => 'Category', 'type' => 'Type');
-    echo 'var formInfoFields = ' . json_encode($formInfoTypes) . PHP_EOL;
-    foreach ($formInfoTypes as $formInfoType => $humanisedName) {
-        echo 'var ' . $formInfoType . 'FormInfoValues = {' . PHP_EOL;
-        foreach ($info[$formInfoType] as $key => $formInfoData) {
-            echo '"' . $key . '": "<span class=\"blue bold\">' . h($formInfoData['key']) . '</span>: ' . h($formInfoData['desc']) . '<br />",' . PHP_EOL;
-        }
-        echo '}' . PHP_EOL;
-    }
-?>
-//
-//Generate Category / Type filtering array
-//
-var category_type_mapping = new Array();
-<?php
-    foreach ($categoryDefinitions as $category => $def) {
-        echo "category_type_mapping['" . addslashes($category) . "'] = {";
-        $first = true;
-        foreach ($def['types'] as $type) {
-            if ($first) $first = false;
-            else echo ', ';
-            echo "'" . addslashes($type) . "' : '" . addslashes($type) . "'";
-        }
-        echo "}; \n";
-    }
-?>
-
-$(document).ready(function() {
-    initPopoverContent('Attribute');
-    $('#AttributeDistribution').change(function() {
-        if ($('#AttributeDistribution').val() == 4) $('#SGContainer').show();
-        else $('#SGContainer').hide();
-    });
-
-    <?php
-        if (!$objectAttribute):
-    ?>
-        $("#AttributeCategory").on('change', function(e) {
-            formCategoryChanged('Attribute');
-            if ($(this).val() === 'Attribution' || $(this).val() === 'Targeting data') {
-                $("#warning-message").show();
-            } else {
-                $("#warning-message").hide();
-            }
-            if ($(this).val() === 'Internal reference') {
-                $("#AttributeDistribution").val('0');
-                $('#SGContainer').hide();
-            }
-        });
-    var start = $("#AttributeType").val();
-    formCategoryChanged('Attribute');
-    $("#AttributeType").val(start);
-    <?php
-        endif;
-    ?>
-
-    $("#AttributeCategory, #AttributeType, #AttributeDistribution").change(function() {
-        var start = $("#AttributeType").val();
-        initPopoverContent('Attribute');
-        $("#AttributeType").val(start);
-    });
-});
-</script>
-<?php echo $this->Js->writeBuffer(); // Write cached scripts