diff --git a/app/Controller/GalaxiesController.php b/app/Controller/GalaxiesController.php
index 26f5e71f4..ce1496c92 100644
--- a/app/Controller/GalaxiesController.php
+++ b/app/Controller/GalaxiesController.php
@@ -114,9 +114,9 @@ class GalaxiesController extends AppController
         $conditions = $namespace === '0' ? array() : array('namespace' => $namespace);
         $galaxies = $this->Galaxy->find('all', array(
             'recursive' => -1,
-            'fields' => array('MAX(Galaxy.version) as latest_version', '*'),
+            'fields' => array('MAX(Galaxy.version) as latest_version', 'id', 'kill_chain_order', 'name', 'icon', 'description'),
             'conditions' => $conditions,
-            'group' => array('name'),
+            'group' => array('name', 'id', 'kill_chain_order', 'icon', 'description'),
             'order' => array('name asc')
         ));
         $items = array(
diff --git a/app/Model/Galaxy.php b/app/Model/Galaxy.php
index e6bf610a8..bd9c84f4c 100644
--- a/app/Model/Galaxy.php
+++ b/app/Model/Galaxy.php
@@ -383,7 +383,7 @@ class Galaxy extends AppModel
                     'Galaxy.type' => $type,
                     'Galaxy.namespace' => $namespace
                 ),
-                'group' => array('name')
+                'group' => array('name', 'id')
         ));
         return empty($galaxy) ? 0 : $galaxy['Galaxy']['id'];
     }