diff --git a/app/routes.py b/app/routes.py
index d63ac6a..46ff7e1 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -337,7 +337,6 @@ def add_organization():
     )
 
 
-@mod.route("/organization/", methods=["GET"])
 @mod.route("/organizations/", methods=["GET"])
 def view_organizations():
     organizations = db.get_all_organizations()
@@ -472,16 +471,16 @@ def view_harvest_source_data(source_id: str):
         count=True,
         skip_pagination=True,
         source_id=source.id,
-        facets=["ckan_id != null"],
+        facets="ckan_id is not null",
     )
     error_records_count = db.get_harvest_records_by_source(
         count=True,
         skip_pagination=True,
         source_id=source.id,
-        facets=["status = 'error'"],
+        facets="status = 'error'",
     )
-    # TODO: wire in paginated jobs query
-    jobs = db.get_all_harvest_jobs_by_filter({"harvest_source_id": source.id})
+    # TODO: wire in paginated jobs htmx refresh ui & route
+    jobs = db.pget_harvest_jobs(facets=f"harvest_source_id = '{source.id}'")
     next_job = "N/A"
     future_jobs = db.get_new_harvest_jobs_by_source_in_future(source.id)
     if len(future_jobs):
@@ -528,7 +527,6 @@ def view_harvest_source_data(source_id: str):
     return render_template("view_source_data.html", data=data)
 
 
-@mod.route("/harvest_source/", methods=["GET"])
 @mod.route("/harvest_sources/", methods=["GET"])
 def view_harvest_sources():
     sources = db.get_all_harvest_sources()
@@ -745,18 +743,45 @@ def get_harvest_record(record_id):
 def get_harvest_records():
     job_id = request.args.get("harvest_job_id")
     source_id = request.args.get("harvest_source_id")
-    page = request.args.get("page")
+    paginate = request.args.get("paginate", type=bool)
+    skip_pagination = request.args.get("skip_pagination", type=bool)
+    count = request.args.get("count", type=bool)
+    page = request.args.get("page", type=int)
+    facets = request.args.get("facets", "")
     if job_id:
-        records = db.get_harvest_records_by_job(job_id, page)
-        if not records:
-            return "No harvest records found for this harvest job", 404
+        records = db.get_harvest_records_by_job(
+            job_id,
+            page=page,
+            paginate=paginate,
+            skip_pagination=skip_pagination,
+            facets=facets,
+        )
+
     elif source_id:
-        records = db.get_harvest_records_by_source(source_id, page)
+        records = db.get_harvest_records_by_source(
+            source_id,
+            page=page,
+            paginate=paginate,
+            skip_pagination=skip_pagination,
+            count=count,
+            facets=facets,
+        )
         if not records:
             return "No harvest records found for this harvest source", 404
     else:
-        records = db.pget_harvest_records(page)
-    return db._to_dict(records)
+        records = db.pget_harvest_records(
+            page=page,
+            paginate=paginate,
+            skip_pagination=skip_pagination,
+            facets=facets,
+        )
+
+    if not records:
+        return "No harvest records found for this query", 404
+    elif isinstance(records, int):
+        return f"{records} records found", 200
+    else:
+        return db._to_dict(records)
 
 
 @mod.route("/harvest_record/<record_id>/raw", methods=["GET"])
@@ -818,27 +843,6 @@ def get_data_sources():
     return render_template("get_data_sources.html", sources=source, organizations=org)
 
 
-## Test interface, will remove later
-@mod.route("/delete_all_records", methods=["DELETE"])
-def delete_all_records():
-    db.delete_all_harvest_records()
-    return "All harvest records deleted"
-
-
-## Test interface, will remove later
-@mod.route("/add_harvest_job_error", methods=["POST"])
-def add_harvest_job_error():
-    db.add_harvest_job_error(request.json)
-    return "Added harvest job error"
-
-
-## Test interface, will remove later
-@mod.route("/add_harvest_record_error", methods=["POST"])
-def add_harvest_record_error():
-    err = db.add_harvest_record_error(request.json)
-    return db._to_dict(err)
-
-
 def register_routes(app):
     app.register_blueprint(mod)
     app.register_blueprint(user)
diff --git a/database/interface.py b/database/interface.py
index b552cd3..6eb04a3 100644
--- a/database/interface.py
+++ b/database/interface.py
@@ -7,9 +7,10 @@
 
 import ckanapi
 from ckanapi import RemoteCKAN
-from sqlalchemy import create_engine, func, inspect, or_, select, text
+from sqlalchemy import create_engine, func, inspect, select, text
 from sqlalchemy.exc import NoResultFound
 from sqlalchemy.orm import scoped_session, sessionmaker
+from harvester.utils.general_utils import query_filter_builder
 
 from .models import (
     HarvestJob,
@@ -224,8 +225,9 @@ def _clear_harvest_records():
 
         ckan_ids = [record.ckan_id for record in records if record.ckan_id is not None]
         error_records = [record for record in records if record.status == "error"]
-        jobs_in_progress = self.get_all_harvest_jobs_by_filter(
-            {"harvest_source_id": source.id, "status": "in_progress"}
+        jobs_in_progress = self.pget_harvest_jobs(
+            facets=f"harvest_source_id = '{source.id}', 'status' = 'in_progress'",
+            paginate=False,
         )
 
         # Ensure no jobs are in progress
@@ -325,10 +327,6 @@ def add_harvest_job(self, job_data):
     def get_harvest_job(self, job_id):
         return self.db.query(HarvestJob).filter_by(id=job_id).first()
 
-    def get_all_harvest_jobs_by_filter(self, filter):
-        harvest_jobs = self.db.query(HarvestJob).filter_by(**filter).all()
-        return [job for job in harvest_jobs or []]
-
     def get_first_harvest_jobs_by_filter(self, filter):
         harvest_job = (
             self.db.query(HarvestJob)
@@ -361,11 +359,6 @@ def get_new_harvest_jobs_by_source_in_future(self, source_id):
         )
         return [job for job in harvest_jobs or []]
 
-    def get_harvest_jobs_by_faceted_filter(self, attr, values):
-        query_list = [getattr(HarvestJob, attr) == value for value in values]
-        harvest_jobs = self.db.query(HarvestJob).filter(or_(*query_list)).all()
-        return [job for job in harvest_jobs]
-
     def update_harvest_job(self, job_id, updates):
         try:
             job = self.db.get(HarvestJob, job_id)
@@ -602,29 +595,32 @@ def verify_user(self, usr_data):
     #### PAGINATED QUERIES ####
     @count
     @paginate
-    def pget_harvest_jobs(self, filter=text(""), **kwargs):
-        return self.db.query(HarvestJob).filter(filter)
+    def pget_harvest_jobs(self, facets="", **kwargs):
+        facet_string = query_filter_builder(None, facets)
+        return self.db.query(HarvestJob).filter(text(facet_string))
 
     @count
     @paginate
-    def pget_harvest_records(self, filter=text(""), **kwargs):
-        return self.db.query(HarvestRecord).filter(filter)
+    def pget_harvest_records(self, facets="", **kwargs):
+        return self.db.query(HarvestRecord).filter(text(facets))
 
     @count
     @paginate
-    def pget_harvest_job_errors(self, filter=text(""), **kwargs):
-        return self.db.query(HarvestJobError).filter(filter)
+    def pget_harvest_job_errors(self, facets="", **kwargs):
+        return self.db.query(HarvestJobError).filter(text(facets))
 
     @count
     @paginate
-    def pget_harvest_record_errors(self, filter=text(""), **kwargs):
-        return self.db.query(HarvestRecordError).filter(filter)
+    def pget_harvest_record_errors(self, facets="", **kwargs):
+        return self.db.query(HarvestRecordError).filter(text(facets))
 
-    #### FACETED BUILDER QUERIES ####
-    def get_harvest_records_by_job(self, job_id, facets=[], **kwargs):
-        filter_string = " AND ".join([f"harvest_job_id = '{job_id}'"] + facets)
-        return self.pget_harvest_records(filter=text(filter_string), **kwargs)
+    #### FILTERED BUILDER QUERIES ####
+    def get_harvest_records_by_job(self, job_id, facets="", **kwargs):
+        facet_string = query_filter_builder(f"harvest_job_id = '{job_id}'", facets)
+        return self.pget_harvest_records(facets=facet_string, **kwargs)
 
-    def get_harvest_records_by_source(self, source_id, facets=[], **kwargs):
-        filter_string = " AND ".join([f"harvest_source_id = '{source_id}'"] + facets)
-        return self.pget_harvest_records(filter=text(filter_string), **kwargs)
+    def get_harvest_records_by_source(self, source_id, facets="", **kwargs):
+        facet_string = query_filter_builder(
+            f"harvest_source_id = '{source_id}'", facets
+        )
+        return self.pget_harvest_records(facets=facet_string, **kwargs)
diff --git a/harvester/lib/load_manager.py b/harvester/lib/load_manager.py
index 3d53c8c..dbbd066 100644
--- a/harvester/lib/load_manager.py
+++ b/harvester/lib/load_manager.py
@@ -129,8 +129,9 @@ def trigger_manual_job(self, source_id):
         """manual trigger harvest job,
         takes a source_id"""
         source = interface.get_harvest_source(source_id)
-        jobs_in_progress = interface.get_all_harvest_jobs_by_filter(
-            {"harvest_source_id": source.id, "status": "in_progress"}
+        jobs_in_progress = interface.pget_harvest_jobs(
+            facets=f"harvest_source_id = '{source.id}', status = 'in_progress'",
+            paginate=False,
         )
         if len(jobs_in_progress):
             return f"Can't trigger harvest. Job {jobs_in_progress[0].id} already in progress."  # noqa E501
diff --git a/harvester/utils/general_utils.py b/harvester/utils/general_utils.py
index 24bec3c..2682575 100644
--- a/harvester/utils/general_utils.py
+++ b/harvester/utils/general_utils.py
@@ -112,3 +112,21 @@ def download_waf(files):
         output.append({"url": file, "content": download_file(file, ".xml")})
 
     return output
+
+
+def query_filter_builder(base, facets):
+    """Builds filter strings from base and comma separated string of filters
+    :param base str - base filter query
+    :param facets str - extra facets
+
+    """
+    if base is None:
+        facet_string = facets.split(",")[0]
+        facet_list = facets.split(",")[1:]
+    else:
+        facet_string = base
+        facet_list = facets.split(",")
+    for facet in facet_list:
+        if facet != "":
+            facet_string += f" AND {facet}"
+    return facet_string
diff --git a/tests/conftest.py b/tests/conftest.py
index 08fffe9..315f573 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -356,7 +356,6 @@ def interface_with_multiple_sources(
     return interface_with_fixture_json
 
 
-## MISC
 @pytest.fixture
 def interface_with_multiple_jobs(interface_no_jobs, source_data_dcatus):
     statuses = ["new", "in_progress", "complete", "error"]
diff --git a/tests/integration/app/test_load_manager.py b/tests/integration/app/test_load_manager.py
index 3ae9622..b505192 100644
--- a/tests/integration/app/test_load_manager.py
+++ b/tests/integration/app/test_load_manager.py
@@ -189,8 +189,9 @@ def test_manual_job_doesnt_affect_scheduled_jobs(
         assert source_data_dcatus["frequency"] == "daily"
         assert jobs[0].date_created == datetime.now() + timedelta(days=1)
 
-        jobs = interface_no_jobs.get_all_harvest_jobs_by_filter(
-            {"harvest_source_id": source_data_dcatus["id"]}
+        source_id = source_data_dcatus["id"]
+        jobs = interface_no_jobs.pget_harvest_jobs(
+            facets=f"harvest_source_id = '{source_id}'"
         )
         assert len(jobs) == 2
         assert jobs[0].date_created == datetime.now() + timedelta(days=1)
@@ -212,8 +213,9 @@ def test_dont_create_new_job_if_job_already_in_progress(
         load_manager = LoadManager()
         load_manager.schedule_first_job(source_data_dcatus["id"])
         message = load_manager.trigger_manual_job(source_data_dcatus["id"])
-        new_job = interface_no_jobs.get_all_harvest_jobs_by_filter(
-            {"harvest_source_id": source_data_dcatus["id"], "status": "in_progress"}
+        source_id = source_data_dcatus["id"]
+        new_job = interface_no_jobs.pget_harvest_jobs(
+            facets=f"harvest_source_id = '{source_id}', status = 'in_progress'"
         )
         assert message == f"Updated job {new_job[0].id} to in_progress"
         message = load_manager.trigger_manual_job(source_data_dcatus["id"])
@@ -222,8 +224,8 @@ def test_dont_create_new_job_if_job_already_in_progress(
             == f"Can't trigger harvest. Job {new_job[0].id} already in progress."
         )
 
-        jobs = interface_no_jobs.get_all_harvest_jobs_by_filter(
-            {"harvest_source_id": source_data_dcatus["id"]}
+        jobs = interface_no_jobs.pget_harvest_jobs(
+            facets=f"harvest_source_id = '{source_id}'"
         )
 
         assert len(jobs) == 2
@@ -251,8 +253,9 @@ def test_assert_env_var_changes_task_size(
         assert start_task_mock.call_args[0][4] == "1536"
 
         # clear out in progress jobs
-        jobs = interface_no_jobs.get_all_harvest_jobs_by_filter(
-            {"harvest_source_id": source_data_dcatus["id"]}
+        source_id = source_data_dcatus["id"]
+        jobs = interface_no_jobs.pget_harvest_jobs(
+            facets=f"harvest_source_id = '{source_id}'"
         )
         interface_no_jobs.delete_harvest_job(jobs[0].id)
 
@@ -283,8 +286,9 @@ def test_trigger_cancel_job(
         load_manager = LoadManager()
         load_manager.trigger_manual_job(source_data_dcatus["id"])
 
-        jobs = interface_no_jobs.get_all_harvest_jobs_by_filter(
-            {"harvest_source_id": source_data_dcatus["id"]}
+        source_id = source_data_dcatus["id"]
+        jobs = interface_no_jobs.pget_harvest_jobs(
+            facets=f"harvest_source_id = '{source_id}'"
         )
 
         task_guid_val = "3a24b55a02b0-eb7b-4eeb-9f45-645cedd3d93b"
diff --git a/tests/integration/app/test_login_required.py b/tests/integration/app/test_login_required.py
index 09af18e..1933321 100644
--- a/tests/integration/app/test_login_required.py
+++ b/tests/integration/app/test_login_required.py
@@ -24,89 +24,88 @@ def wrapper(*args, **kwargs):
     return inner
 
 
-# Logged in user can see protected page
-@force_login(email="test@data.gov")
-def test_harvest_edit__logged_in(client, interface_no_jobs, source_data_dcatus):
-    res = client.get(f"/harvest_source/config/edit/{source_data_dcatus['id']}")
-    assert res.status_code == 200
-
-
-# Logged out user cannot see protected page
-def test_harvest_edit__logged_out(client, interface_no_jobs, source_data_dcatus):
-    res = client.get(f"/harvest_source/config/edit/{source_data_dcatus['id']}")
-    redirect_str = 'You should be redirected automatically to the target URL: <a href="/login">/login</a>'
-    assert res.status_code == 302
-    assert res.text.find(redirect_str) != -1
-
-
-# Logged in user is redirected away from bad url
-@force_login(email="test@data.gov")
-def test_harvest_edit_bad_source_url(client, interface_no_jobs):
-    res = client.get("/harvest_source/config/edit/1234")
-    redirect_str = 'You should be redirected automatically to the target URL: <a href="/harvest_sources/">/harvest_sources/</a>'
-    assert res.status_code == 302
-    assert res.text.find(redirect_str) != -1
-
-
-# Logged in user can see the organization action buttons
-@force_login(email="test@data.gov")
-def test_org_edit_buttons__logged_in(
-    client, interface_with_multiple_jobs, source_data_dcatus, organization_data
-):
-    res = client.get(f"/organization/{organization_data['id']}")
-    button_string_text = '<div class="config-actions">'
-    org_edit_text = f'<a href="/organization/config/edit/{organization_data["id"]}"'
-    org_delete_text = f"onclick=\"confirmDelete('/organization/config/delete/{organization_data['id']}')"
-    assert res.status_code == 200
-    assert res.text.find(button_string_text) != -1
-    assert res.text.find(org_edit_text) != -1
-    assert res.text.find(org_delete_text) != -1
-
-
-# Logged out user cannot see the organization action buttons
-def test_org_edit_buttons__logged_out(client, interface_no_jobs, organization_data):
-    res = client.get(f"/organization/{organization_data['id']}")
-    button_string_text = '<div class="config-actions">'
-    org_edit_text = f'<a href="/organization/config/edit/{organization_data["id"]}"'
-    org_delete_text = f"onclick=\"confirmDelete('/organization/config/delete/{organization_data['id']}')"
-    assert res.status_code == 200
-    assert res.text.find(button_string_text) == -1
-    assert res.text.find(org_edit_text) == -1
-    assert res.text.find(org_delete_text) == -1
-
-
-# Logged in user can see the harvest source action buttons
-@force_login(email="test@data.gov")
-def test_harvest_data_edit_buttons__logged_in(
-    client, interface_no_jobs, source_data_dcatus
-):
-    res = client.get(f"/harvest_source/{source_data_dcatus['id']}")
-    button_string_text = '<div class="config-actions">'
-    source_edit_text = (
-        f'<a href="/harvest_source/config/edit/{source_data_dcatus["id"]}"'
-    )
-    source_clear_text = f"onclick=\"confirmAction('clear', '/harvest_source/config/clear/{source_data_dcatus['id']}')"
-    source_delete_text = f"onclick=\"confirmAction('delete', '/harvest_source/config/delete/{source_data_dcatus['id']}')"
-    assert res.status_code == 200
-    assert res.text.find(button_string_text) != -1
-    assert res.text.find(source_edit_text) != -1
-    assert res.text.find(source_clear_text) != -1
-    assert res.text.find(source_delete_text) != -1
-
-
-# Logged out user cannot see the harvest source action buttons
-def test_harvest_data_edit_buttons__logged_out(
-    client, interface_no_jobs, source_data_dcatus
-):
-    res = client.get(f"/harvest_source/{source_data_dcatus['id']}")
-    button_string_text = '<div class="config-actions">'
-    source_edit_text = (
-        f'<a href="/harvest_source/config/edit/{source_data_dcatus["id"]}"'
-    )
-    source_clear_text = f"onclick=\"confirmAction('clear', '/harvest_source/config/clear/{source_data_dcatus['id']}')"
-    source_delete_text = f"onclick=\"confirmAction('delete', '/harvest_source/config/delete/{source_data_dcatus['id']}')"
-    assert res.status_code == 200
-    assert res.text.find(button_string_text) == -1
-    assert res.text.find(source_edit_text) == -1
-    assert res.text.find(source_clear_text) == -1
-    assert res.text.find(source_delete_text) == -1
+class TestLogin:
+    # Logged in user can see protected page
+    @force_login(email="test@data.gov")
+    def test_harvest_edit__logged_in(
+        self, client, interface_no_jobs, source_data_dcatus
+    ):
+        res = client.get(f"/harvest_source/config/edit/{source_data_dcatus['id']}")
+        assert res.status_code == 200
+
+    # Logged out user cannot see protected page
+    def test_harvest_edit__logged_out(
+        self, client, interface_no_jobs, source_data_dcatus
+    ):
+        res = client.get(f"/harvest_source/config/edit/{source_data_dcatus['id']}")
+        redirect_str = 'You should be redirected automatically to the target URL: <a href="/login">/login</a>'
+        assert res.status_code == 302
+        assert res.text.find(redirect_str) != -1
+
+    # Logged in user is redirected away from bad url
+    @force_login(email="test@data.gov")
+    def test_harvest_edit_bad_source_url(self, client, interface_no_jobs):
+        res = client.get("/harvest_source/config/edit/1234")
+        redirect_str = 'You should be redirected automatically to the target URL: <a href="/harvest_sources/">/harvest_sources/</a>'
+        assert res.status_code == 302
+        assert res.text.find(redirect_str) != -1
+
+    # Logged in user can see the organization action buttons
+    @force_login(email="test@data.gov")
+    def test_org_edit_buttons__logged_in(
+        self, client, interface_with_multiple_jobs, source_data_dcatus, organization_data
+    ):
+        res = client.get(f"/organization/{organization_data['id']}")
+        button_string_text = '<div class="config-actions">'
+        org_edit_text = f'<a href="/organization/config/edit/{organization_data["id"]}"'
+        org_delete_text = f"onclick=\"confirmDelete('/organization/config/delete/{organization_data['id']}')"
+        assert res.status_code == 200
+        assert res.text.find(button_string_text) != -1
+        assert res.text.find(org_edit_text) != -1
+        assert res.text.find(org_delete_text) != -1
+
+    # Logged out user cannot see the organization action buttons
+    def test_org_edit_buttons__logged_out(self, client, interface_no_jobs, organization_data):
+        res = client.get(f"/organization/{organization_data['id']}")
+        button_string_text = '<div class="config-actions">'
+        org_edit_text = f'<a href="/organization/config/edit/{organization_data["id"]}"'
+        org_delete_text = f"onclick=\"confirmDelete('/organization/config/delete/{organization_data['id']}')"
+        assert res.status_code == 200
+        assert res.text.find(button_string_text) == -1
+        assert res.text.find(org_edit_text) == -1
+        assert res.text.find(org_delete_text) == -1
+
+    # Logged in user can see the harvest source action buttons
+    @force_login(email="test@data.gov")
+    def test_harvest_data_edit_buttons__logged_in(
+        self, client, interface_no_jobs, source_data_dcatus
+    ):
+        res = client.get(f"/harvest_source/{source_data_dcatus['id']}")
+        button_string_text = '<div class="config-actions">'
+        source_edit_text = (
+            f'<a href="/harvest_source/config/edit/{source_data_dcatus["id"]}"'
+        )
+        source_clear_text = f"onclick=\"confirmAction('clear', '/harvest_source/config/clear/{source_data_dcatus['id']}')"
+        source_delete_text = f"onclick=\"confirmAction('delete', '/harvest_source/config/delete/{source_data_dcatus['id']}')"
+        assert res.status_code == 200
+        assert res.text.find(button_string_text) != -1
+        assert res.text.find(source_edit_text) != -1
+        assert res.text.find(source_clear_text) != -1
+        assert res.text.find(source_delete_text) != -1
+
+    # Logged out user cannot see the harvest source action buttons
+    def test_harvest_data_edit_buttons__logged_out(
+        self, client, interface_no_jobs, source_data_dcatus
+    ):
+        res = client.get(f"/harvest_source/{source_data_dcatus['id']}")
+        button_string_text = '<div class="config-actions">'
+        source_edit_text = (
+            f'<a href="/harvest_source/config/edit/{source_data_dcatus["id"]}"'
+        )
+        source_clear_text = f"onclick=\"confirmAction('clear', '/harvest_source/config/clear/{source_data_dcatus['id']}')"
+        source_delete_text = f"onclick=\"confirmAction('delete', '/harvest_source/config/delete/{source_data_dcatus['id']}')"
+        assert res.status_code == 200
+        assert res.text.find(button_string_text) == -1
+        assert res.text.find(source_edit_text) == -1
+        assert res.text.find(source_clear_text) == -1
+        assert res.text.find(source_delete_text) == -1
diff --git a/tests/integration/app/test_routes.py b/tests/integration/app/test_routes.py
new file mode 100644
index 0000000..eb204ad
--- /dev/null
+++ b/tests/integration/app/test_routes.py
@@ -0,0 +1,29 @@
+class TestRoutes:
+    def test_get_home(
+        self,
+        client,
+    ):
+        res = client.get("/")
+        assert res.status_code == 200
+
+    def test_get_organizations(
+        self,
+        client,
+    ):
+        res = client.get("/organizations/")
+        assert res.status_code == 200
+
+    def test_get_organization(
+        self,
+        client,
+        interface_with_multiple_jobs,
+        organization_data,
+    ):
+        res = client.get(f"/organization/{organization_data['id']}")
+        assert res.status_code == 200
+
+    def test_get_harvest_source(
+        self, client, interface_with_multiple_jobs, source_data_dcatus
+    ):
+        res = client.get(f"/harvest_source/{source_data_dcatus['id']}")
+        assert res.status_code == 200
diff --git a/tests/integration/database/test_db.py b/tests/integration/database/test_db.py
index 5e438f0..8e3b663 100644
--- a/tests/integration/database/test_db.py
+++ b/tests/integration/database/test_db.py
@@ -264,7 +264,7 @@ def test_endpoint_pagnation(
         assert len(db_records) == 0
 
         db_records = interface.pget_harvest_records(
-            filter=text(f"id = '{id_lookup_table['test-identifier-0']}'")
+            facets=f"id = '{id_lookup_table['test-identifier-0']}'"
         )
         assert len(db_records) == 1
         assert db_records[0].harvest_job_id == job_data_dcatus["id"]
@@ -323,15 +323,12 @@ def test_add_harvest_job_without_id(
         assert job.status == job_data_dcatus["status"]
         assert job.harvest_source_id == job_data_dcatus["harvest_source_id"]
 
-    def test_get_all_harvest_jobs_by_filter(
+    def test_get_all_harvest_jobs_by_facet(
         self, source_data_dcatus, interface_with_multiple_jobs
     ):
-        filters = {
-            "status": "new",
-            "harvest_source_id": f"{source_data_dcatus['id']}",
-        }
-        filtered_list = interface_with_multiple_jobs.get_all_harvest_jobs_by_filter(
-            filters
+        source_id = source_data_dcatus["id"]
+        filtered_list = interface_with_multiple_jobs.pget_harvest_jobs(
+            facets=f"status = 'new', harvest_source_id = '{source_id}'"
         )
         assert len(filtered_list) == 3
         assert filtered_list[0].status == "new"
@@ -388,9 +385,10 @@ def test_get_new_harvest_jobs_by_source_in_future(
     def test_filter_jobs_by_faceted_filter(
         self, source_data_dcatus, interface_with_multiple_jobs
     ):
-        faceted_list = interface_with_multiple_jobs.get_harvest_jobs_by_faceted_filter(
-            "status", ["new", "in_progress"]
+        faceted_list = interface_with_multiple_jobs.pget_harvest_jobs(
+            facets="status = 'new' OR status = 'in_progress'"
         )
+
         assert len(faceted_list) == 6
         assert len([x for x in faceted_list if x.status == "new"]) == 3
         assert (
@@ -521,7 +519,7 @@ def test_faceted_builder_queries(
 
         id_lookup_table = interface.add_harvest_records(records)
 
-        # # source id, no facets
+        # source id, no facets
         db_records = interface.get_harvest_records_by_source(source_data_dcatus["id"])
         assert len(db_records) == 20
 
@@ -547,14 +545,23 @@ def test_faceted_builder_queries(
         # source id, plus extra filter_text facet
         db_records = interface.get_harvest_records_by_source(
             source_data_dcatus["id"],
-            facets=[f"id = '{id_lookup_table['test-identifier-0']}'"],
+            facets=f"id = '{id_lookup_table['test-identifier-0']}'",
         )
         assert len(db_records) == 1
 
         # source id, plus extra filter_text facet, plus kwargs to return only count
         db_records = interface.get_harvest_records_by_source(
             source_data_dcatus["id"],
-            facets=[f"id = '{id_lookup_table['test-identifier-0']}'"],
+            facets=f"id = '{id_lookup_table['test-identifier-0']}'",
+            skip_pagination=True,
+            count=True,
+        )
+        assert db_records == 1
+
+        # source id, plus two facets
+        db_records = interface.get_harvest_records_by_source(
+            source_data_dcatus["id"],
+            facets=f"id = '{id_lookup_table['test-identifier-4']}',identifier = 'test-identifier-4'",  # noqa E501
             skip_pagination=True,
             count=True,
         )
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
index 912ac0f..c5956b3 100644
--- a/tests/unit/test_utils.py
+++ b/tests/unit/test_utils.py
@@ -1,7 +1,7 @@
 import pytest
 
 from harvester.utils.ckan_utils import munge_tag, munge_title_to_name
-from harvester.utils.general_utils import parse_args
+from harvester.utils.general_utils import parse_args, query_filter_builder
 
 # these tests are copied from
 # https://github.com/ckan/ckan/blob/master/ckan/tests/lib/test_munge.py
@@ -52,3 +52,20 @@ class TestGeneralUtils:
     def test_args_parsing(self):
         args = parse_args(["test-id"])
         assert args.jobId == "test-id"
+
+    @pytest.mark.parametrize(
+        "base,facets,expected",
+        [
+            ("1", "", "1"),
+            ("1", "234", "1 AND 234"),
+            ("1", "2,3,4", "1 AND 2 AND 3 AND 4"),
+            ("1", "2,3,4,", "1 AND 2 AND 3 AND 4"),
+            ("1", "2 != 3,3 <= 4,", "1 AND 2 != 3 AND 3 <= 4"),
+            (None, "1 AND 2", "1 AND 2"),
+            (None, "1,2", "1 AND 2"),
+            (None, "1 , 2", "1  AND  2"),
+            (None, "1 OR 2", "1 OR 2"),
+        ],
+    )
+    def test_facet_builder(self, base, facets, expected):
+        assert expected == query_filter_builder(base, facets)