diff --git a/spec/services/filter_service_spec.rb b/spec/services/filter_service_spec.rb
index 1e892fd56..2c89b1302 100644
--- a/spec/services/filter_service_spec.rb
+++ b/spec/services/filter_service_spec.rb
@@ -2,26 +2,80 @@ require "rails_helper"
 
 describe FilterService do
   describe "filter_by_search" do
-    before do
-      FactoryBot.create_list(:organisation, 5)
-      FactoryBot.create(:organisation, name: "Acme LTD")
-    end
+    context "when filtering organisations" do
+      before do
+        FactoryBot.create_list(:organisation, 5)
+        FactoryBot.create(:organisation, name: "Acme LTD")
+      end
+
+      let(:organisation_list) { Organisation.all }
+
+      context "when given a search term" do
+        let(:search_term) { "Acme" }
 
-    let(:organisation_list) { Organisation.all }
+        it "filters the collection on search term" do
+          expect(described_class.filter_by_search(organisation_list, search_term).count).to eq(1)
+        end
+      end
 
-    context "when given a search term" do
-      let(:search_term) { "Acme" }
+      context "when not given a search term" do
+        let(:search_term) { nil }
 
-      it "filters the collection on search term" do
-        expect(described_class.filter_by_search(organisation_list, search_term).count).to eq(1)
+        it "does not filter the given collection" do
+          expect(described_class.filter_by_search(organisation_list, search_term).count).to eq(6)
+        end
       end
     end
 
-    context "when not given a search term" do
-      let(:search_term) { nil }
+    context "when filtering logs" do
+      context "when filtering lettings logs" do
+        before do
+          FactoryBot.create_list(:lettings_log, 5)
+          FactoryBot.create(:lettings_log, postcode_full: "SW1 1AA")
+        end
+
+        let(:lettings_log_list) { LettingsLog.all }
+
+        context "when given a postcode" do
+          let(:search_term) { "SW1 1AA" }
+
+          it "filters the collection on search term" do
+            expect(described_class.filter_by_search(lettings_log_list, search_term).count).to eq(1)
+          end
+        end
+
+        context "when not given a search term" do
+          let(:search_term) { nil }
+
+          it "does not filter the given collection" do
+            expect(described_class.filter_by_search(lettings_log_list, search_term).count).to eq(6)
+          end
+        end
+      end
+
+      context "when filtering sales logs" do
+        before do
+          FactoryBot.create_list(:sales_log, 5)
+          FactoryBot.create(:sales_log, purchid: "2")
+        end
+
+        let(:sales_log_list) { SalesLog.all }
+
+        context "when given a purchid" do
+          let(:search_term) { "2" }
+
+          it "filters the collection on search term" do
+            expect(described_class.filter_by_search(sales_log_list, search_term).count).to eq(1)
+          end
+        end
+
+        context "when not given a search term" do
+          let(:search_term) { nil }
 
-      it "does not filter the given collection" do
-        expect(described_class.filter_by_search(organisation_list, search_term).count).to eq(6)
+          it "does not filter the given collection" do
+            expect(described_class.filter_by_search(sales_log_list, search_term).count).to eq(6)
+          end
+        end
       end
     end
   end