diff --git a/bin/lib/Tag.py b/bin/lib/Tag.py
index 94b2eca4..64850b3c 100755
--- a/bin/lib/Tag.py
+++ b/bin/lib/Tag.py
@@ -338,7 +338,7 @@ def get_galaxy_meta(galaxy_name, nb_active_tags=False):
     else:
         meta['icon'] = f'fas fa-{icon}'
     if nb_active_tags:
-        meta['nb_active_tags'] = get_galaxy_nb_tags_enabled(galaxy)
+        meta['nb_active_tags'] = get_galaxy_nb_tags_enabled(galaxy.type)
         meta['nb_tags'] = len(get_galaxy_tags(galaxy.type))
     return meta
 
diff --git a/var/www/templates/tags/galaxies.html b/var/www/templates/tags/galaxies.html
index ff69c2b5..ac0b443c 100644
--- a/var/www/templates/tags/galaxies.html
+++ b/var/www/templates/tags/galaxies.html
@@ -41,7 +41,7 @@
                             <th>Namespace</th>
                             <th>Enabled</th>
                             <th>Active Tags</th>
-                            <th></th>
+                            <th><i class="fas fa-cogs fa-2x"></i></th>
                         </tr>
                     </thead>
                     <tbody>
@@ -51,7 +51,7 @@
                                 <td>{{ galaxy['description'] }}</td>
                                 <td>{{ galaxy['namespace'] }}</td>
                                 <td class="text-center">
-                                    {% if galaxy['enebled'] %}
+                                    {% if galaxy['enabled'] %}
                                         <div style="color:Green;">
                                             <i class="fas fa-check-circle fa-2x"></i>
 										</div>
@@ -69,7 +69,7 @@
                                     </h5>
                                 </td>
                                 <td>
-                                    <a class="btn btn-outline-secondary" href="{{ url_for('tags_ui.tags_galaxy') }}?galaxy={{ galaxy['type'] }}">
+                                    <a class="btn btn-outline-secondary" href="{{ url_for('tags_ui.tags_galaxy') }}?galaxy={{ galaxy['type'] }}" data-toggle="tooltip" title="Show or Enable">
                                         <i class="fas fa-tag"></i>
                                     </a>
                                 </td>
@@ -98,7 +98,7 @@ $(document).ready(function(){
   $("#nav_galaxies").addClass("active");
 
 
-  $('#myTable_').DataTable({ "lengthMenu": [ 5, 10, 25, 50, 100 ], "pageLength": 15, "order": [[ 0, "asc" ]] });
+  $('#myTable_').DataTable({ "lengthMenu": [ 5, 10, 25, 50, 100 ], "pageLength": 15, "order": [[ 3, "desc" ]] });
 
 });
 </script>
diff --git a/var/www/templates/tags/taxonomies.html b/var/www/templates/tags/taxonomies.html
index eff480b5..ac3346d7 100644
--- a/var/www/templates/tags/taxonomies.html
+++ b/var/www/templates/tags/taxonomies.html
@@ -41,7 +41,7 @@
                             <th>Version</th>
                             <th>Enabled</th>
                             <th>Active Tags</th>
-                            <th></th>
+                            <th><i class="fas fa-cogs fa-2x"></i></th>
                         </tr>
                     </thead>
                     <tbody>
@@ -69,7 +69,7 @@
                                     </h5>
                                 </td>
                                 <td>
-                                    <a class="btn btn-outline-secondary" href="{{ url_for('tags_ui.tags_taxonomy') }}?taxonomy={{ taxonomy }}">
+                                    <a class="btn btn-outline-secondary" href="{{ url_for('tags_ui.tags_taxonomy') }}?taxonomy={{ taxonomy }}" data-toggle="tooltip" title="Show or Enable">
                                         <i class="fas fa-tag"></i>
                                     </a>
                                 </td>
@@ -98,7 +98,7 @@ $(document).ready(function(){
   $("#nav_taxonomies").addClass("active");
 
 
-  $('#myTable_').DataTable({ "lengthMenu": [ 5, 10, 25, 50, 100 ], "pageLength": 15, "order": [[ 0, "asc" ]] });
+  $('#myTable_').DataTable({ "lengthMenu": [ 5, 10, 25, 50, 100 ], "pageLength": 15, "order": [[ 3, "desc" ]] });
 
 });
 </script>