diff --git a/app/app.js b/app/app.js
index 56994df..1fb4a0b 100644
--- a/app/app.js
+++ b/app/app.js
@@ -2,6 +2,7 @@
 
 angular.module('bansho', [
     'ngRoute',
+	'angular.filter',
     'bansho.config',
     'bansho.authentication',
     'bansho.utils.promiseManager',
diff --git a/app/components/table/table.html b/app/components/table/table.html
index 38eceef..99e606b 100644
--- a/app/components/table/table.html
+++ b/app/components/table/table.html
@@ -9,8 +9,8 @@
       </tr>
   </thead>
 
-  <tbody class="{{entry.child_class}}" ng-repeat="entry in entries | actionbarSelectFilter:actionbarFilters.activeFilter | filter:actionbarFilters.searchFilter | noRepeat:this | wrappableStyle:this">
-    <tr>
+  <tbody class="{{entry.child_class}}" ng-repeat="(groupByKey, groupByItems) in entries | groupBy:'host_name'">
+    <tr ng-repeat="entry in groupByItems | actionbarSelectFilter:actionbarFilters.activeFilter | filter:actionbarFilters.searchFilter | noRepeat:this | wrappableStyle:this">
       <td><input type="checkbox" ng-model="entry.is_checked"></td>
       <td bansho-cell cell-name="{{cell}}" ng-repeat="cell in cellsName"></td>
     </tr>
diff --git a/app/index.html b/app/index.html
index 637904c..cbfd494 100644
--- a/app/index.html
+++ b/app/index.html
@@ -14,6 +14,7 @@
 
     <!-- build:js js/app.min.js -->
     <script src="bower_components/angular/angular.js"></script>
+    <script src="bower_components/angular-filter/dist/angular-filter.min.js"></script>
     <script src="bower_components/angular-route/angular-route.js"></script>
     <script src="bower_components/jquery/dist/jquery.min.js"></script>
     <script src="bower_components/moment/moment.js"></script>
diff --git a/bower.json b/bower.json
index 5547804..8209b29 100644
--- a/bower.json
+++ b/bower.json
@@ -13,6 +13,7 @@
     "bootstrap-sass-official": "3.3.1",
     "fontawesome": "4.2.0",
     "justgage-toorshia": "master",
-    "moment": "~2.9.0"
+    "moment": "~2.9.0",
+    "angular-filter": "~0.5.4"
   }
 }