diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/foxxActiveView.ejs b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/foxxActiveView.ejs
index 3827b4e6f9..9c5e6a8c7d 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/foxxActiveView.ejs
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/foxxActiveView.ejs
@@ -1,19 +1,6 @@
 <script id="foxxActiveView.ejs" type="text/template">
   <div class="borderBox"></div>
   <img src="foxxes/thumbnail?mount=<%= model.encodedMount() %>" height="50" width="50" alt="Icon for Service" class="icon">
-    <% if (model.needsAttention()) { %>
-      <span class="warning-icons">
-        <% if (model.isBroken()) { %>
-          <span class="fa fa-warning" title="Mount error"></span>
-        <% } %>
-        <% if (model.needsConfiguration()) { %>
-          <span class="fa fa-cog" title="Needs configuration"></span>
-        <% } %>
-        <% if (model.hasUnconfiguredDependencies()) { %>
-          <span class="fa fa-cubes" title="Unconfigured dependencies">!</span>
-        <% } %>
-      </span>
-    <% } %>
   <% if(model.isDevelopment()) { %>
     <div class="tileBadge">
       <span>
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/foxxActiveView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/foxxActiveView.js
index b7cd11468f..57f7421299 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/foxxActiveView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/foxxActiveView.js
@@ -46,9 +46,53 @@
     },
 
     render: function(){
+
       $(this.el).html(this.template.render({
         model: this.model
       }));
+
+      var conf = function() {
+        if (this.model.needsConfiguration()) {
+
+          if ($(this.el).find('.warning-icons').length > 0) {
+            $(this.el).find('.warning-icons')
+            .append('<span class="fa fa-cog" title="Needs configuration"></span>');
+          }
+          else {
+            $(this.el).find('img')
+            .after(
+              '<span class="warning-icons"><span class="fa fa-cog" title="Needs configuration"></span></span>'
+            );
+          }
+        }
+      }.bind(this);
+
+      var depend = function() {
+        if (this.model.hasUnconfiguredDependencies()) {
+
+          if ($(this.el).find('.warning-icons').length > 0) {
+            $(this.el).find('.warning-icons')
+            .append('<span class="fa fa-cubes" title="Unconfigured dependencies"></span>');
+          }
+          else {
+            $(this.el).find('img')
+            .after(
+              '<span class="warning-icons"><span class="fa fa-cubes" title="Unconfigured dependencies"></span></span>'
+            );
+          }
+        }
+      }.bind(this);
+
+      /*isBroken function in model doesnt make sense
+      var broken = function() {
+        $(this.el).find('warning-icons')
+        .append('<span class="fa fa-warning" title="Mount error"></span>');
+      }.bind(this);
+       */
+
+      this.model.getConfiguration(conf);
+      this.model.getDependencies(depend);
+
       return $(this.el);
     }
   });
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/queryManagementView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/queryManagementView.js
index 4d09ea8d7f..37d518944b 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/queryManagementView.js
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/queryManagementView.js
@@ -187,6 +187,7 @@
               message,
               "",
               "",
+              "",
               ""
             ]);
           }
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/scss/_queryView.scss b/js/apps/system/_admin/aardvark/APP/frontend/scss/_queryView.scss
index d9cceab187..64a2d945fa 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/scss/_queryView.scss
+++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/_queryView.scss
@@ -43,6 +43,12 @@ toolbar {
   }
 }
 
+#queryManagementContent,
+#arangoQueryManagementTable {
+  .table-cell1 {
+    word-break: break-all;
+  }
+}
 
 .queryMethods {
 
@@ -445,4 +451,5 @@ toolbar {
   .arango-icon-disk {
     margin-top: 1px;
   }
+
 }