diff --git a/elcid/assets/js/elcid/controllers/result_view.js b/elcid/assets/js/elcid/controllers/result_view.js
index 732a917a9..0d3e929e0 100644
--- a/elcid/assets/js/elcid/controllers/result_view.js
+++ b/elcid/assets/js/elcid/controllers/result_view.js
@@ -5,9 +5,7 @@ angular.module('opal.controllers').controller('ResultView', function(
     var vm = this;
 
     this.labTests = [];
-    this.departments = [];
     this.showAll = {};
-    this.checkedDepartments = {}
 
     this.parseFloat = parseFloat;
     this.Math = window.Math;
@@ -33,53 +31,11 @@ angular.module('opal.controllers').controller('ResultView', function(
         return observation.replace('-', '').trim().length;
     }
 
-    this.includes = function(string1, string2){
-        // case insensitive check, does string1 exist in string2
-        return string2.toLowerCase().indexOf(string1.toLowerCase()) !== -1
-    }
-
     this.show = function(name){
-        var toShow = true
-        if(vm.filterString && !this.includes(vm.filterString, name)){
-            toShow = false;
-        }
-        if(toShow && _.any(_.values(vm.checkedDepartments))){
-            var labTest = vm.lab_tests[name];
-            if(labTest.long_form){
-                toShow =  _.any(_.map(labTest.instances, vm.showLongFormLabTest))
-            }
-            else{
-                toShow = vm.showTabularLabTest(labTest, vm.showTabularLabTest)
-            }
-        }
-        return toShow;
-    }
-
-    this.showLongFormLabTest = function(labTestInstance){
-        if(_.any(_.values(vm.checkedDepartments))){
-            if(!labTestInstance || !labTestInstance.department){
-                return false;
-            }
-            return vm.checkedDepartments[labTestInstance.department]
-        }
-        return true;
-    }
-
-    this.visibleCount = function(test_name){
-        return _.filter(vm.lab_tests[test_name].instances, this.showLongFormLabTest).length
-    }
-
-    this.showTabularLabTest = function(labTestInstances){
-        if(_.any(_.values(vm.checkedDepartments))){
-            var checkedDepartments = [];
-            _.each(vm.checkedDepartments, function(v, k){
-                if(v){
-                    checkedDepartments.push(k)
-                }
-            });
-            return !!_.intersection(checkedDepartments, labTestInstances.instances.departments).length
+        if(!vm.filterString){
+            return true
         }
-        return true;
+        return name.toLowerCase().indexOf(vm.filterString.toLowerCase()) !== -1
     }
 
     this.getLabTests = function(patient){
@@ -89,8 +45,7 @@ angular.module('opal.controllers').controller('ResultView', function(
         return LabTestResults.load(patient.id).then(function(result){
 
             vm.test_order = result.test_order;
-            vm.lab_tests   = result.tests;
-            vm.departments = result.departments;
+            vm.lab_tests   = result.tests
             ngProgressLite.done();
 
         });
diff --git a/elcid/templates/detail/result.html b/elcid/templates/detail/result.html
index 07506c427..8f1930509 100644
--- a/elcid/templates/detail/result.html
+++ b/elcid/templates/detail/result.html
@@ -17,15 +17,6 @@ <h3>
             <input class="form-control" placeholder="Filter" ng-model="resultView.filterString" />
           </div>
         </div>
-        <div class="row">
-          <form class="form-inline">
-            <div class="form-group">
-              <button ng-repeat='department in resultView.departments' type="button" class="btn btn-default content-offset-right-5 content-offset-left-5 content-offset-10" ng-model="resultView.checkedDepartments[department]" uib-btn-checkbox>
-                [[ department ]]
-              </button>
-            </div>
-          </form>
-        </div>
       </div>
       <!-- End Panel Header -->
 
@@ -39,7 +30,7 @@ <h5 class="">
           <div ng-if="resultView.lab_tests[test_name].long_form">
 
             <div ng-repeat="instance in resultView.lab_tests[test_name].instances"
-                 class="row content-offset-below-10" ng-show="resultView.showLongFormLabTest(instance) && (resultView.showAll[test_name] || $index < 11)">
+                 class="row content-offset-below-10" ng-show="resultView.showAll[test_name] || $index < 11">
 
               <div class="col-md-3">
                 <a href="/#/lab-test/[[ instance.lab_number ]]/"class="orange-link" >[[ instance.lab_number ]]</a>
@@ -63,11 +54,11 @@ <h5 class="">
 
             </div>
 
-            <div ng-show="!resultView.showAll[test_name] && resultView.visibleCount(test_name) > 10">
+            <div ng-show="!resultView.showAll[test_name] && resultView.lab_tests[test_name].instances.length > 10">
               <a ng-click="resultView.toggleShowAll(test_name)"
                  class="orange-link pointer"
                  >
-                Show [[ resultView.visibleCount(test_name) - 10 ]] more
+                Show [[ resultView.lab_tests[test_name].instances.length - 10 ]] more
               </a>
             </div>
 
@@ -89,7 +80,7 @@ <h5 class="">
 
               </tr>
 
-              <tr ng-show="resultView.showTabularLabTest(resultView.lab_tests[test_name])" ng-repeat="observation_name in resultView.lab_tests[test_name].instances.observation_names">
+              <tr ng-repeat="observation_name in resultView.lab_tests[test_name].instances.observation_names">
                 <td class="col-xs-3">[[ observation_name ]]</td>
                 <td class="col-xs-1">
                   [[ resultView.lab_tests[test_name].instances.observation_ranges[observation_name] ]]