diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 00000000..fbe6f6b8
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,16 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Python Debugger: Django",
+      "type": "debugpy",
+      "request": "launch",
+      "program": "${workspaceFolder}/manage.py",
+      "args": ["runserver"],
+      "django": true
+    }
+  ]
+}
diff --git a/home/forms/__init__.py b/home/forms/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/home/forms/search.py b/home/forms/search.py
new file mode 100644
index 00000000..ee4dae15
--- /dev/null
+++ b/home/forms/search.py
@@ -0,0 +1,76 @@
+from copy import deepcopy
+from django import forms
+from urllib.parse import urlencode
+
+# from home.helper import get_domain_list
+
+
+def get_domain_choices():
+    """Make API call to obtain domain choices"""
+    # TODO: pull in the domains from the catalogue client
+    # facets = client.search_facets()
+    # domain_list = facets.options("domains")
+    return [
+        ("urn:li:domain:HMCTS", "HMCTS"),
+        ("urn:li:domain:HMPPS", "HMPPS"),
+        ("urn:li:domain:OPG", "OPG"),
+        ("urn:li:domain:HQ", "HQ"),
+    ]
+
+
+def get_sort_choices():
+    return [
+        ("relevance", "Relevance"),
+        ("ascending", "Ascending"),
+        ("descending", "Descending"),
+    ]
+
+
+class SearchForm(forms.Form):
+    """Django form to represent data product search page inputs"""
+
+    query = forms.CharField(
+        max_length=100,
+        strip=False,
+        required=False,
+        widget=forms.TextInput(attrs={"class": "govuk-input search-input"}),
+    )
+    domains = forms.MultipleChoiceField(
+        choices=get_domain_choices,
+        required=False,
+        widget=forms.CheckboxSelectMultiple(
+            attrs={"class": "govuk-checkboxes__input", "form": "searchform"}
+        ),
+    )
+    sort = forms.ChoiceField(
+        choices=get_sort_choices,
+        widget=forms.RadioSelect(
+            attrs={
+                "class": "govuk-radios__input",
+                "form": "searchform",
+                "onchange": "document.getElementById('searchform').submit();",
+            }
+        ),
+        required=False,
+    )
+    clear_filter = forms.BooleanField(initial=False, required=False)
+    clear_label = forms.BooleanField(initial=False, required=False)
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.initial["sort"] = "relevance"
+
+    def clean_query(self):
+        """Example clean method to apply custom validation to input fields"""
+        return str(self.cleaned_data["query"]).capitalize()
+
+    def encode_without_filter(self, filter_to_remove):
+        """Preformat hrefs to drop individual filters"""
+        # Deepcopy the cleaned data dict to avoid modifying it inplace
+        query_params = deepcopy(self.cleaned_data)
+
+        query_params["domains"].remove(filter_to_remove)
+        if len(query_params["domains"]) == 0:
+            query_params.pop("domains")
+
+        return f"?{urlencode(query_params, doseq=True)}"
diff --git a/home/service/__init__.py b/home/service/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/home/service/base.py b/home/service/base.py
new file mode 100644
index 00000000..69945e65
--- /dev/null
+++ b/home/service/base.py
@@ -0,0 +1,11 @@
+from data_platform_catalogue.client import BaseCatalogueClient
+from data_platform_catalogue.client.datahub import DataHubCatalogueClient
+from django.conf import settings
+
+
+class GenericService:
+    @staticmethod
+    def _get_catalogue_client() -> BaseCatalogueClient:
+        return DataHubCatalogueClient(
+            jwt_token=settings.CATALOGUE_TOKEN, api_url=settings.CATALOGUE_URL
+        )
diff --git a/home/service/details.py b/home/service/details.py
new file mode 100644
index 00000000..da87f7f8
--- /dev/null
+++ b/home/service/details.py
@@ -0,0 +1,33 @@
+from data_platform_catalogue.search_types import MultiSelectFilter, ResultType
+from django.core.exceptions import ObjectDoesNotExist
+
+from .base import GenericService
+
+
+class DetailsService(GenericService):
+    def __init__(self, urn: str):
+        self.urn = urn
+        self.client = self._get_catalogue_client()
+
+        filter_value = [MultiSelectFilter("urn", [urn])]
+        search_results = self.client.search(
+            query="", page=None, filters=filter_value)
+
+        if not search_results.page_results:
+            raise ObjectDoesNotExist(urn)
+
+        self.result = search_results.page_results[0]
+        self.context = self._get_context()
+
+    def _get_context(self):
+        context = {
+            "result": self.result,
+            "result_type": (
+                "Data product"
+                if self.result.result_type == ResultType.DATA_PRODUCT
+                else "Table"
+            ),
+            "page_title": f"{self.result.name} - Data catalogue",
+        }
+
+        return context
diff --git a/home/service/search.py b/home/service/search.py
new file mode 100644
index 00000000..95f1092f
--- /dev/null
+++ b/home/service/search.py
@@ -0,0 +1,81 @@
+from typing import Any
+
+from data_platform_catalogue.search_types import MultiSelectFilter, SortOption
+from django.core.paginator import Paginator
+
+from home.forms.search import SearchForm
+
+from .base import GenericService
+
+
+class SearchService(GenericService):
+    def __init__(self, form: SearchForm, page: str, items_per_page: int = 20):
+        self.form = form
+        self.page = page
+        self.client = self._get_catalogue_client()
+        self.results = self._get_search_results(page, items_per_page)
+        self.paginator = self._get_paginator(items_per_page)
+        self.context = self._get_context()
+
+    def _get_search_results(self, page: str, items_per_page: int):
+        if self.form.is_bound:
+            form_data = self.form.cleaned_data
+        else:
+            form_data = {}
+        query = form_data.get("query", "")
+        sort = form_data.get("sort", "relevance")
+        domains = form_data.get("domains", [])
+        filter_value = [MultiSelectFilter(
+            "domains", domains)] if domains else []
+        page_for_search = str(int(page) - 1)
+        if sort == "ascending":
+            sort_option = SortOption(field="name", ascending=True)
+        elif sort == "descending":
+            sort_option = SortOption(field="name", ascending=False)
+        else:
+            sort_option = None
+
+        results = self.client.search(
+            query=query,
+            page=page_for_search,
+            filters=filter_value,
+            sort=sort_option,
+            count=items_per_page,
+        )
+
+        return results
+
+    def _get_paginator(self, items_per_page: int) -> Paginator:
+        pages_list = list(range(self.results.total_results))
+
+        return Paginator(pages_list, items_per_page)
+
+    def _get_context(self) -> dict[str, Any]:
+
+        if self.form["query"].value:
+            page_title = f'Search for "{self.form["query"].value}" - Data catalogue'
+        else:
+            page_title = "Search - Data catalogue"
+
+        if self.form.is_bound:
+            label_clear_href = {
+                filter.split(":")[-1]: self.form.encode_without_filter(filter)
+                for filter in self.form.cleaned_data.get("domains")
+            }
+        else:
+            label_clear_href = None
+
+        context = {
+            "form": self.form,
+            "results": self.results.page_results,
+            "page_title": page_title,
+            "page_obj": self.paginator.get_page(self.page),
+            "page_range": self.paginator.get_elided_page_range(
+                self.page, on_each_side=2, on_ends=1
+            ),
+            "paginator": self.paginator,
+            "total_results": self.results.total_results,
+            "label_clear_href": label_clear_href,
+        }
+
+        return context
diff --git a/home/services.py b/home/services.py
deleted file mode 100644
index 58b51a34..00000000
--- a/home/services.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from data_platform_catalogue.client import BaseCatalogueClient
-from data_platform_catalogue.client.datahub import DataHubCatalogueClient
-from django.conf import settings
-
-
-def get_catalogue_client() -> BaseCatalogueClient:
-    return DataHubCatalogueClient(
-        jwt_token=settings.CATALOGUE_TOKEN, api_url=settings.CATALOGUE_URL
-    )
diff --git a/home/templatetags/future.py b/home/templatetags/future.py
new file mode 100644
index 00000000..759cdc33
--- /dev/null
+++ b/home/templatetags/future.py
@@ -0,0 +1,38 @@
+from django import template
+from django.utils.itercompat import is_iterable
+
+register = template.Library()
+
+
+# Backport from unreleased Django
+# This can be removed after Django 5.1 is released
+@register.simple_tag(takes_context=True)
+def query_string(context, query_dict=None, **kwargs):
+    """
+    Add, remove, and change parameters of a ``QueryDict`` and return the result
+    as a query string. If the ``query_dict`` argument is not provided, default
+    to ``request.GET``.
+    For example::
+        {% query_string foo=3 %}
+    To remove a key::
+        {% query_string foo=None %}
+    To use with pagination::
+        {% query_string page=page_obj.next_page_number %}
+    A custom ``QueryDict`` can also be used::
+        {% query_string my_query_dict foo=3 %}
+    """
+    if query_dict is None:
+        query_dict = context.request.GET
+    query_dict = query_dict.copy()
+    for key, value in kwargs.items():
+        if value is None:
+            if key in query_dict:
+                del query_dict[key]
+        elif is_iterable(value) and not isinstance(value, str):
+            query_dict.setlist(key, value)
+        else:
+            query_dict[key] = value
+    if not query_dict:
+        return ""
+    query_string = query_dict.urlencode()
+    return f"?{query_string}"
diff --git a/home/views.py b/home/views.py
index e36c3e70..45db819d 100644
--- a/home/views.py
+++ b/home/views.py
@@ -1,144 +1,38 @@
-from data_platform_catalogue.search_types import (
-    MultiSelectFilter, ResultType, SortOption
-)
-from django.conf import settings
+from django.core.exceptions import ObjectDoesNotExist
+from django.http import Http404
 from django.shortcuts import render
 
-from .helper import filter_seleted_domains, get_domain_list
-from django.core.paginator import Paginator
-from .services import get_catalogue_client
+from home.forms.search import SearchForm
+from home.service.details import DetailsService
+from home.service.search import SearchService
 
 
-# Create your views here.
 def home_view(request):
     context = {}
     return render(request, "home.html", context)
 
 
 def details_view(request, id):
-    context = {}
-    client = get_catalogue_client()
-    filter_value = [MultiSelectFilter("urn", id)]
-    search_results = client.search(query="", page=None, filters=filter_value)
-    result = search_results.page_results[0]
-    context["result"] = result
-    context["result_type"] = (
-        "Data product" if result.result_type == ResultType.DATA_PRODUCT else "Table"
-    )
-    context["page_title"] = f"{result.name} - Data catalogue"
+    try:
+        service = DetailsService(id)
+    except ObjectDoesNotExist:
+        raise Http404("Asset does not exist")
+
+    context = service.context
 
     return render(request, "details.html", context)
 
 
 def search_view(request, page: str = "1"):
     new_search = request.GET.get("new", "")
-    query = request.GET.get("query", "")
-    page_for_search = str(int(page) - 1)
-    client = get_catalogue_client()
-    domain_list = get_domain_list(client)
-
-    context = {}
-    context["domainlist"] = domain_list
-
-    domains = request.GET.getlist("domain", [])
-    sortby = request.GET.get("sortby", None)
-    context["sortby"] = sortby
-
-    if sortby == "ascending":
-        sort = SortOption(field="name", ascending=True)
-    elif sortby == "descending":
-        sort = SortOption(field="name", ascending=False)
-    else:
-        sort = None
-
-    if domains:
-        selected_domain = filter_seleted_domains(domain_list, domains)
-        context["selected_domain"] = selected_domain
-        request.session["selected_domain"] = selected_domain
-        request.session["domains"] = domains
-        filter_value = [MultiSelectFilter("domains", domains)]
-        query = request.session.get("query", "")
-    elif request.GET.get("clear_filter") == "True":
-        filter_value = []
-        context["selected_domain"] = {}
-        request.session["selected_domain"] = {}
-        request.session["domains"] = []
-        query = request.session.get("query", "")
-    elif request.GET.get("clear_label") == "True":
-        # Value to clear
-        label_value = request.GET.getlist("value")
-
-        # Remove the selected value from list
-        domains = request.session.get("domains", None)
-        domains = list(set(domains) - set(label_value))
-        # Populated selected domain
-        selected_domain = filter_seleted_domains(domain_list, domains)
-        context["domains"] = domains
-        context["selected_domain"] = selected_domain
-
-        # Reassign to session
-        request.session["selected_domain"] = selected_domain
-        request.session["domains"] = domains
-        query = request.session.get("query", "")
-
-        if not domains:
-            filter_value = []
-        else:
-            filter_value = [MultiSelectFilter("domains", domains)]
-
-    elif request.GET.get("query"):
-        query = request.GET.get("query")
-        domains = request.session.get("domains", None)
-        request.session["query"] = query
-        context["query"] = query
-        domains = request.session.get("domains", [])
-
-        # Preserve filter
-        selected_domain = filter_seleted_domains(domain_list, domains)
-        if not domains:
-            filter_value = []
-        else:
-            context["selected_domain"] = selected_domain
-            context["domains"] = domains
-            filter_value = [MultiSelectFilter("domains", domains)]
-    else:
-        if page == "1" and new_search:
-            filter_value = []
-            request.session.clear()
-            request.session["domains"] = domains
-            context["selected_domain"] = {}
-            context["query"] = ""
-        else:
-            domains = request.session.get("domains", [])
-            filter_value = []
-            context["selected_domain"] = filter_seleted_domains(
-                domain_list, domains)
-            context["domains"] = domains
-            query = request.session.get("query", "")
-
-    # Search with filter
-
-    search_results = client.search(
-        query=query, page=page_for_search, filters=filter_value, sort=sort
-    )
-
-    items_per_page = 20
-    pages_list = list(range(search_results.total_results))
-    paginator = Paginator(pages_list, items_per_page)
-
-    context["query"] = query
-    context["results"] = search_results.page_results
-    context["total_results"] = search_results.total_results
-    context["page_obj"] = paginator.get_page(page)
-    context["page_range"] = paginator.get_elided_page_range(
-        page, on_each_side=2, on_ends=1
-    )
-    context["paginator"] = paginator
-    context["sortby"] = sortby
-
-    if query:
-        context["page_title"] = f'Search for "{query}" - Data catalogue'
+    if new_search:
+        form = SearchForm()
     else:
-        context["page_title"] = "Search - Data catalogue"
-
-    return render(request, "search.html", context)
+        # Populated search scenario
+        form = SearchForm(request.GET)
+        if not form.is_valid():
+            print("form error on validation")
+            print(form.errors)
+
+    search_service = SearchService(form=form, page=page)
+    return render(request, "search.html", search_service.context)
diff --git a/poetry.lock b/poetry.lock
index 8caca685..e48a14a1 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand.
 
 [[package]]
 name = "acryl-datahub"
@@ -952,6 +952,20 @@ files = [
 [package.extras]
 tests = ["black", "pytest", "pytest-cov", "tox"]
 
+[[package]]
+name = "faker"
+version = "22.6.0"
+description = "Faker is a Python package that generates fake data for you."
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "Faker-22.6.0-py3-none-any.whl", hash = "sha256:2b57f0256da6b45b7851dca87836ef5e2ae2fbb64d63d8697f1e47830d7b505d"},
+    {file = "Faker-22.6.0.tar.gz", hash = "sha256:fa6d969728ef3da6229da91267a1bd4e6b902044c4822012d4fc46c71bb92b26"},
+]
+
+[package.dependencies]
+python-dateutil = ">=2.4"
+
 [[package]]
 name = "filelock"
 version = "3.13.1"
@@ -1613,71 +1627,71 @@ testing = ["coverage", "pyyaml"]
 
 [[package]]
 name = "markupsafe"
-version = "2.1.4"
+version = "2.1.5"
 description = "Safely add untrusted strings to HTML/XML markup."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "MarkupSafe-2.1.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:de8153a7aae3835484ac168a9a9bdaa0c5eee4e0bc595503c95d53b942879c84"},
-    {file = "MarkupSafe-2.1.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e888ff76ceb39601c59e219f281466c6d7e66bd375b4ec1ce83bcdc68306796b"},
-    {file = "MarkupSafe-2.1.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0b838c37ba596fcbfca71651a104a611543077156cb0a26fe0c475e1f152ee8"},
-    {file = "MarkupSafe-2.1.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dac1ebf6983148b45b5fa48593950f90ed6d1d26300604f321c74a9ca1609f8e"},
-    {file = "MarkupSafe-2.1.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0fbad3d346df8f9d72622ac71b69565e621ada2ce6572f37c2eae8dacd60385d"},
-    {file = "MarkupSafe-2.1.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d5291d98cd3ad9a562883468c690a2a238c4a6388ab3bd155b0c75dd55ece858"},
-    {file = "MarkupSafe-2.1.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:a7cc49ef48a3c7a0005a949f3c04f8baa5409d3f663a1b36f0eba9bfe2a0396e"},
-    {file = "MarkupSafe-2.1.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b83041cda633871572f0d3c41dddd5582ad7d22f65a72eacd8d3d6d00291df26"},
-    {file = "MarkupSafe-2.1.4-cp310-cp310-win32.whl", hash = "sha256:0c26f67b3fe27302d3a412b85ef696792c4a2386293c53ba683a89562f9399b0"},
-    {file = "MarkupSafe-2.1.4-cp310-cp310-win_amd64.whl", hash = "sha256:a76055d5cb1c23485d7ddae533229039b850db711c554a12ea64a0fd8a0129e2"},
-    {file = "MarkupSafe-2.1.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9e9e3c4020aa2dc62d5dd6743a69e399ce3de58320522948af6140ac959ab863"},
-    {file = "MarkupSafe-2.1.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0042d6a9880b38e1dd9ff83146cc3c9c18a059b9360ceae207805567aacccc69"},
-    {file = "MarkupSafe-2.1.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:55d03fea4c4e9fd0ad75dc2e7e2b6757b80c152c032ea1d1de487461d8140efc"},
-    {file = "MarkupSafe-2.1.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ab3a886a237f6e9c9f4f7d272067e712cdb4efa774bef494dccad08f39d8ae6"},
-    {file = "MarkupSafe-2.1.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:abf5ebbec056817057bfafc0445916bb688a255a5146f900445d081db08cbabb"},
-    {file = "MarkupSafe-2.1.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e1a0d1924a5013d4f294087e00024ad25668234569289650929ab871231668e7"},
-    {file = "MarkupSafe-2.1.4-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:e7902211afd0af05fbadcc9a312e4cf10f27b779cf1323e78d52377ae4b72bea"},
-    {file = "MarkupSafe-2.1.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:c669391319973e49a7c6230c218a1e3044710bc1ce4c8e6eb71f7e6d43a2c131"},
-    {file = "MarkupSafe-2.1.4-cp311-cp311-win32.whl", hash = "sha256:31f57d64c336b8ccb1966d156932f3daa4fee74176b0fdc48ef580be774aae74"},
-    {file = "MarkupSafe-2.1.4-cp311-cp311-win_amd64.whl", hash = "sha256:54a7e1380dfece8847c71bf7e33da5d084e9b889c75eca19100ef98027bd9f56"},
-    {file = "MarkupSafe-2.1.4-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:a76cd37d229fc385738bd1ce4cba2a121cf26b53864c1772694ad0ad348e509e"},
-    {file = "MarkupSafe-2.1.4-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:987d13fe1d23e12a66ca2073b8d2e2a75cec2ecb8eab43ff5624ba0ad42764bc"},
-    {file = "MarkupSafe-2.1.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5244324676254697fe5c181fc762284e2c5fceeb1c4e3e7f6aca2b6f107e60dc"},
-    {file = "MarkupSafe-2.1.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:78bc995e004681246e85e28e068111a4c3f35f34e6c62da1471e844ee1446250"},
-    {file = "MarkupSafe-2.1.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a4d176cfdfde84f732c4a53109b293d05883e952bbba68b857ae446fa3119b4f"},
-    {file = "MarkupSafe-2.1.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:f9917691f410a2e0897d1ef99619fd3f7dd503647c8ff2475bf90c3cf222ad74"},
-    {file = "MarkupSafe-2.1.4-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:f06e5a9e99b7df44640767842f414ed5d7bedaaa78cd817ce04bbd6fd86e2dd6"},
-    {file = "MarkupSafe-2.1.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:396549cea79e8ca4ba65525470d534e8a41070e6b3500ce2414921099cb73e8d"},
-    {file = "MarkupSafe-2.1.4-cp312-cp312-win32.whl", hash = "sha256:f6be2d708a9d0e9b0054856f07ac7070fbe1754be40ca8525d5adccdbda8f475"},
-    {file = "MarkupSafe-2.1.4-cp312-cp312-win_amd64.whl", hash = "sha256:5045e892cfdaecc5b4c01822f353cf2c8feb88a6ec1c0adef2a2e705eef0f656"},
-    {file = "MarkupSafe-2.1.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:7a07f40ef8f0fbc5ef1000d0c78771f4d5ca03b4953fc162749772916b298fc4"},
-    {file = "MarkupSafe-2.1.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d18b66fe626ac412d96c2ab536306c736c66cf2a31c243a45025156cc190dc8a"},
-    {file = "MarkupSafe-2.1.4-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:698e84142f3f884114ea8cf83e7a67ca8f4ace8454e78fe960646c6c91c63bfa"},
-    {file = "MarkupSafe-2.1.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:49a3b78a5af63ec10d8604180380c13dcd870aba7928c1fe04e881d5c792dc4e"},
-    {file = "MarkupSafe-2.1.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:15866d7f2dc60cfdde12ebb4e75e41be862348b4728300c36cdf405e258415ec"},
-    {file = "MarkupSafe-2.1.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:6aa5e2e7fc9bc042ae82d8b79d795b9a62bd8f15ba1e7594e3db243f158b5565"},
-    {file = "MarkupSafe-2.1.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:54635102ba3cf5da26eb6f96c4b8c53af8a9c0d97b64bdcb592596a6255d8518"},
-    {file = "MarkupSafe-2.1.4-cp37-cp37m-win32.whl", hash = "sha256:3583a3a3ab7958e354dc1d25be74aee6228938312ee875a22330c4dc2e41beb0"},
-    {file = "MarkupSafe-2.1.4-cp37-cp37m-win_amd64.whl", hash = "sha256:d6e427c7378c7f1b2bef6a344c925b8b63623d3321c09a237b7cc0e77dd98ceb"},
-    {file = "MarkupSafe-2.1.4-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:bf1196dcc239e608605b716e7b166eb5faf4bc192f8a44b81e85251e62584bd2"},
-    {file = "MarkupSafe-2.1.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4df98d4a9cd6a88d6a585852f56f2155c9cdb6aec78361a19f938810aa020954"},
-    {file = "MarkupSafe-2.1.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b835aba863195269ea358cecc21b400276747cc977492319fd7682b8cd2c253d"},
-    {file = "MarkupSafe-2.1.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:23984d1bdae01bee794267424af55eef4dfc038dc5d1272860669b2aa025c9e3"},
-    {file = "MarkupSafe-2.1.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1c98c33ffe20e9a489145d97070a435ea0679fddaabcafe19982fe9c971987d5"},
-    {file = "MarkupSafe-2.1.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:9896fca4a8eb246defc8b2a7ac77ef7553b638e04fbf170bff78a40fa8a91474"},
-    {file = "MarkupSafe-2.1.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:b0fe73bac2fed83839dbdbe6da84ae2a31c11cfc1c777a40dbd8ac8a6ed1560f"},
-    {file = "MarkupSafe-2.1.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:c7556bafeaa0a50e2fe7dc86e0382dea349ebcad8f010d5a7dc6ba568eaaa789"},
-    {file = "MarkupSafe-2.1.4-cp38-cp38-win32.whl", hash = "sha256:fc1a75aa8f11b87910ffd98de62b29d6520b6d6e8a3de69a70ca34dea85d2a8a"},
-    {file = "MarkupSafe-2.1.4-cp38-cp38-win_amd64.whl", hash = "sha256:3a66c36a3864df95e4f62f9167c734b3b1192cb0851b43d7cc08040c074c6279"},
-    {file = "MarkupSafe-2.1.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:765f036a3d00395a326df2835d8f86b637dbaf9832f90f5d196c3b8a7a5080cb"},
-    {file = "MarkupSafe-2.1.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:21e7af8091007bf4bebf4521184f4880a6acab8df0df52ef9e513d8e5db23411"},
-    {file = "MarkupSafe-2.1.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d5c31fe855c77cad679b302aabc42d724ed87c043b1432d457f4976add1c2c3e"},
-    {file = "MarkupSafe-2.1.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7653fa39578957bc42e5ebc15cf4361d9e0ee4b702d7d5ec96cdac860953c5b4"},
-    {file = "MarkupSafe-2.1.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:47bb5f0142b8b64ed1399b6b60f700a580335c8e1c57f2f15587bd072012decc"},
-    {file = "MarkupSafe-2.1.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:fe8512ed897d5daf089e5bd010c3dc03bb1bdae00b35588c49b98268d4a01e00"},
-    {file = "MarkupSafe-2.1.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:36d7626a8cca4d34216875aee5a1d3d654bb3dac201c1c003d182283e3205949"},
-    {file = "MarkupSafe-2.1.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:b6f14a9cd50c3cb100eb94b3273131c80d102e19bb20253ac7bd7336118a673a"},
-    {file = "MarkupSafe-2.1.4-cp39-cp39-win32.whl", hash = "sha256:c8f253a84dbd2c63c19590fa86a032ef3d8cc18923b8049d91bcdeeb2581fbf6"},
-    {file = "MarkupSafe-2.1.4-cp39-cp39-win_amd64.whl", hash = "sha256:8b570a1537367b52396e53325769608f2a687ec9a4363647af1cded8928af959"},
-    {file = "MarkupSafe-2.1.4.tar.gz", hash = "sha256:3aae9af4cac263007fd6309c64c6ab4506dd2b79382d9d19a1994f9240b8db4f"},
+    {file = "MarkupSafe-2.1.5-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:a17a92de5231666cfbe003f0e4b9b3a7ae3afb1ec2845aadc2bacc93ff85febc"},
+    {file = "MarkupSafe-2.1.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:72b6be590cc35924b02c78ef34b467da4ba07e4e0f0454a2c5907f473fc50ce5"},
+    {file = "MarkupSafe-2.1.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e61659ba32cf2cf1481e575d0462554625196a1f2fc06a1c777d3f48e8865d46"},
+    {file = "MarkupSafe-2.1.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2174c595a0d73a3080ca3257b40096db99799265e1c27cc5a610743acd86d62f"},
+    {file = "MarkupSafe-2.1.5-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ae2ad8ae6ebee9d2d94b17fb62763125f3f374c25618198f40cbb8b525411900"},
+    {file = "MarkupSafe-2.1.5-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:075202fa5b72c86ad32dc7d0b56024ebdbcf2048c0ba09f1cde31bfdd57bcfff"},
+    {file = "MarkupSafe-2.1.5-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:598e3276b64aff0e7b3451b72e94fa3c238d452e7ddcd893c3ab324717456bad"},
+    {file = "MarkupSafe-2.1.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:fce659a462a1be54d2ffcacea5e3ba2d74daa74f30f5f143fe0c58636e355fdd"},
+    {file = "MarkupSafe-2.1.5-cp310-cp310-win32.whl", hash = "sha256:d9fad5155d72433c921b782e58892377c44bd6252b5af2f67f16b194987338a4"},
+    {file = "MarkupSafe-2.1.5-cp310-cp310-win_amd64.whl", hash = "sha256:bf50cd79a75d181c9181df03572cdce0fbb75cc353bc350712073108cba98de5"},
+    {file = "MarkupSafe-2.1.5-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:629ddd2ca402ae6dbedfceeba9c46d5f7b2a61d9749597d4307f943ef198fc1f"},
+    {file = "MarkupSafe-2.1.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:5b7b716f97b52c5a14bffdf688f971b2d5ef4029127f1ad7a513973cfd818df2"},
+    {file = "MarkupSafe-2.1.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6ec585f69cec0aa07d945b20805be741395e28ac1627333b1c5b0105962ffced"},
+    {file = "MarkupSafe-2.1.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b91c037585eba9095565a3556f611e3cbfaa42ca1e865f7b8015fe5c7336d5a5"},
+    {file = "MarkupSafe-2.1.5-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7502934a33b54030eaf1194c21c692a534196063db72176b0c4028e140f8f32c"},
+    {file = "MarkupSafe-2.1.5-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:0e397ac966fdf721b2c528cf028494e86172b4feba51d65f81ffd65c63798f3f"},
+    {file = "MarkupSafe-2.1.5-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:c061bb86a71b42465156a3ee7bd58c8c2ceacdbeb95d05a99893e08b8467359a"},
+    {file = "MarkupSafe-2.1.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:3a57fdd7ce31c7ff06cdfbf31dafa96cc533c21e443d57f5b1ecc6cdc668ec7f"},
+    {file = "MarkupSafe-2.1.5-cp311-cp311-win32.whl", hash = "sha256:397081c1a0bfb5124355710fe79478cdbeb39626492b15d399526ae53422b906"},
+    {file = "MarkupSafe-2.1.5-cp311-cp311-win_amd64.whl", hash = "sha256:2b7c57a4dfc4f16f7142221afe5ba4e093e09e728ca65c51f5620c9aaeb9a617"},
+    {file = "MarkupSafe-2.1.5-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:8dec4936e9c3100156f8a2dc89c4b88d5c435175ff03413b443469c7c8c5f4d1"},
+    {file = "MarkupSafe-2.1.5-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:3c6b973f22eb18a789b1460b4b91bf04ae3f0c4234a0a6aa6b0a92f6f7b951d4"},
+    {file = "MarkupSafe-2.1.5-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ac07bad82163452a6884fe8fa0963fb98c2346ba78d779ec06bd7a6262132aee"},
+    {file = "MarkupSafe-2.1.5-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f5dfb42c4604dddc8e4305050aa6deb084540643ed5804d7455b5df8fe16f5e5"},
+    {file = "MarkupSafe-2.1.5-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ea3d8a3d18833cf4304cd2fc9cbb1efe188ca9b5efef2bdac7adc20594a0e46b"},
+    {file = "MarkupSafe-2.1.5-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:d050b3361367a06d752db6ead6e7edeb0009be66bc3bae0ee9d97fb326badc2a"},
+    {file = "MarkupSafe-2.1.5-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:bec0a414d016ac1a18862a519e54b2fd0fc8bbfd6890376898a6c0891dd82e9f"},
+    {file = "MarkupSafe-2.1.5-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:58c98fee265677f63a4385256a6d7683ab1832f3ddd1e66fe948d5880c21a169"},
+    {file = "MarkupSafe-2.1.5-cp312-cp312-win32.whl", hash = "sha256:8590b4ae07a35970728874632fed7bd57b26b0102df2d2b233b6d9d82f6c62ad"},
+    {file = "MarkupSafe-2.1.5-cp312-cp312-win_amd64.whl", hash = "sha256:823b65d8706e32ad2df51ed89496147a42a2a6e01c13cfb6ffb8b1e92bc910bb"},
+    {file = "MarkupSafe-2.1.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:c8b29db45f8fe46ad280a7294f5c3ec36dbac9491f2d1c17345be8e69cc5928f"},
+    {file = "MarkupSafe-2.1.5-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ec6a563cff360b50eed26f13adc43e61bc0c04d94b8be985e6fb24b81f6dcfdf"},
+    {file = "MarkupSafe-2.1.5-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a549b9c31bec33820e885335b451286e2969a2d9e24879f83fe904a5ce59d70a"},
+    {file = "MarkupSafe-2.1.5-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4f11aa001c540f62c6166c7726f71f7573b52c68c31f014c25cc7901deea0b52"},
+    {file = "MarkupSafe-2.1.5-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:7b2e5a267c855eea6b4283940daa6e88a285f5f2a67f2220203786dfa59b37e9"},
+    {file = "MarkupSafe-2.1.5-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:2d2d793e36e230fd32babe143b04cec8a8b3eb8a3122d2aceb4a371e6b09b8df"},
+    {file = "MarkupSafe-2.1.5-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:ce409136744f6521e39fd8e2a24c53fa18ad67aa5bc7c2cf83645cce5b5c4e50"},
+    {file = "MarkupSafe-2.1.5-cp37-cp37m-win32.whl", hash = "sha256:4096e9de5c6fdf43fb4f04c26fb114f61ef0bf2e5604b6ee3019d51b69e8c371"},
+    {file = "MarkupSafe-2.1.5-cp37-cp37m-win_amd64.whl", hash = "sha256:4275d846e41ecefa46e2015117a9f491e57a71ddd59bbead77e904dc02b1bed2"},
+    {file = "MarkupSafe-2.1.5-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:656f7526c69fac7f600bd1f400991cc282b417d17539a1b228617081106feb4a"},
+    {file = "MarkupSafe-2.1.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:97cafb1f3cbcd3fd2b6fbfb99ae11cdb14deea0736fc2b0952ee177f2b813a46"},
+    {file = "MarkupSafe-2.1.5-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1f3fbcb7ef1f16e48246f704ab79d79da8a46891e2da03f8783a5b6fa41a9532"},
+    {file = "MarkupSafe-2.1.5-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fa9db3f79de01457b03d4f01b34cf91bc0048eb2c3846ff26f66687c2f6d16ab"},
+    {file = "MarkupSafe-2.1.5-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ffee1f21e5ef0d712f9033568f8344d5da8cc2869dbd08d87c84656e6a2d2f68"},
+    {file = "MarkupSafe-2.1.5-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:5dedb4db619ba5a2787a94d877bc8ffc0566f92a01c0ef214865e54ecc9ee5e0"},
+    {file = "MarkupSafe-2.1.5-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:30b600cf0a7ac9234b2638fbc0fb6158ba5bdcdf46aeb631ead21248b9affbc4"},
+    {file = "MarkupSafe-2.1.5-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:8dd717634f5a044f860435c1d8c16a270ddf0ef8588d4887037c5028b859b0c3"},
+    {file = "MarkupSafe-2.1.5-cp38-cp38-win32.whl", hash = "sha256:daa4ee5a243f0f20d528d939d06670a298dd39b1ad5f8a72a4275124a7819eff"},
+    {file = "MarkupSafe-2.1.5-cp38-cp38-win_amd64.whl", hash = "sha256:619bc166c4f2de5caa5a633b8b7326fbe98e0ccbfacabd87268a2b15ff73a029"},
+    {file = "MarkupSafe-2.1.5-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:7a68b554d356a91cce1236aa7682dc01df0edba8d043fd1ce607c49dd3c1edcf"},
+    {file = "MarkupSafe-2.1.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:db0b55e0f3cc0be60c1f19efdde9a637c32740486004f20d1cff53c3c0ece4d2"},
+    {file = "MarkupSafe-2.1.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3e53af139f8579a6d5f7b76549125f0d94d7e630761a2111bc431fd820e163b8"},
+    {file = "MarkupSafe-2.1.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:17b950fccb810b3293638215058e432159d2b71005c74371d784862b7e4683f3"},
+    {file = "MarkupSafe-2.1.5-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4c31f53cdae6ecfa91a77820e8b151dba54ab528ba65dfd235c80b086d68a465"},
+    {file = "MarkupSafe-2.1.5-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:bff1b4290a66b490a2f4719358c0cdcd9bafb6b8f061e45c7a2460866bf50c2e"},
+    {file = "MarkupSafe-2.1.5-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:bc1667f8b83f48511b94671e0e441401371dfd0f0a795c7daa4a3cd1dde55bea"},
+    {file = "MarkupSafe-2.1.5-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5049256f536511ee3f7e1b3f87d1d1209d327e818e6ae1365e8653d7e3abb6a6"},
+    {file = "MarkupSafe-2.1.5-cp39-cp39-win32.whl", hash = "sha256:00e046b6dd71aa03a41079792f8473dc494d564611a8f89bbbd7cb93295ebdcf"},
+    {file = "MarkupSafe-2.1.5-cp39-cp39-win_amd64.whl", hash = "sha256:fa173ec60341d6bb97a89f5ea19c85c5643c1e7dedebc22f5181eb73573142c5"},
+    {file = "MarkupSafe-2.1.5.tar.gz", hash = "sha256:d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b"},
 ]
 
 [[package]]
@@ -2395,7 +2409,6 @@ files = [
     {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"},
     {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"},
     {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"},
-    {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"},
     {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"},
     {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"},
     {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"},
@@ -3403,4 +3416,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.11"
-content-hash = "429ad4f0963ec675ccf5649e25e685103ac516030f18c6fe5e4dc11e63124afc"
+content-hash = "0ae06695e2ac3dedebe33805f20a25c4cf72a2395ce547f5cbb66f4f1f8cc6e7"
diff --git a/pyproject.toml b/pyproject.toml
index 360ad6b2..68694726 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -14,6 +14,7 @@ whitenoise = "^6.6.0"
 ministryofjustice-data-platform-catalogue = "^0.10.0"
 markdown = "^3.5.2"
 python-dotenv = "^1.0.1"
+faker = "^22.6.0"
 
 [tool.poetry.group.dev] # dev group definition
 
diff --git a/templates/base/error/page_not_found.html b/templates/base/error/page_not_found.html
new file mode 100644
index 00000000..9e8db9b9
--- /dev/null
+++ b/templates/base/error/page_not_found.html
@@ -0,0 +1,18 @@
+<div class="govuk-width-container">
+    <main class="govuk-main-wrapper govuk-main-wrapper--l" id="main-content" role="main">
+        <div class="govuk-grid-row">
+        <div class="govuk-grid-column-two-thirds">
+            <h1 class="govuk-heading-l">Page not found</h1>
+            <p class="govuk-body">
+            If you typed the web address, check it is correct.
+            </p>
+            <p class="govuk-body">
+            If you pasted the web address, check you copied the entire address.
+            </p>
+            <p class="govuk-body">
+            If the web address is correct or you selected a link or button, <a href="#" class="govuk-link">contact the Tax Credits Helpline</a> if you need to speak to someone about your tax credits.
+            </p>
+        </div>
+        </div>
+    </main>
+</div>
\ No newline at end of file
diff --git a/templates/partial/filter.html b/templates/partial/filter.html
index 7417547d..4d2302e3 100644
--- a/templates/partial/filter.html
+++ b/templates/partial/filter.html
@@ -1,3 +1,4 @@
+{% load future %}
 <div class="govuk-grid-column-one-third">
     <div class="moj-filter">
       <div class="moj-filter__header">
@@ -7,7 +8,7 @@ <h2 class="govuk-heading-m">Filter</h2>
         <div class="moj-filter__header-action">
         </div>
       </div>
-    
+
       <div class="moj-filter__content">
         <div class="moj-filter__selected">
           <div class="moj-filter__selected-heading">
@@ -17,25 +18,26 @@ <h2 class="govuk-heading-m">Selected filters</h2>
             <div class="moj-filter__heading-action">
               <p>
                 <a class="govuk-link govuk-link--no-visited-state"
-              href="{% url 'home:search' %}?clear_filter=True"
-              id="clear_filter"
-            >
+                href="{% url 'home:search' %}{% query_string domains=None %}"
+                id="clear_filter">
                 Clear filter
-            </a>
-            </p>
+                </a>
+              </p>
             </div>
           </div>
-          {% if selected_domain %}
-          <h3 class="govuk-heading-s govuk-!-margin-bottom-0">Domain</h3>
-          <ul class="moj-filter-tags">
-            <input type="hidden" name="clear_label" value="">
-            {% for value, label in selected_domain.items %}
-            <li><a class="moj-filter__tag govuk-link" href="{% url 'home:search' %}?clear_label=True&value={{value}}" onclick="document.getElementById('searchform').submit();"><span class="govuk-visually-hidden">Remove this filter</span> {{label}}</a></li>
-            {% endfor %}
-          </ul>
+          {% if form.domains.value %}
+            <h3 class="govuk-heading-s govuk-!-margin-bottom-0">Domain</h3>
+            <ul class="moj-filter-tags">
+              <input type="hidden" name="clear_label" value="">
+              {% for label, href in label_clear_href.items %}
+                <li><a class="moj-filter__tag govuk-link" href="{{ href }}">
+                  {{label}}<span class="govuk-visually-hidden">Remove this filter</span>
+                </a></li>
+              {% endfor %}
+            </ul>
           {% endif %}
         </div>
-        <div class="moj-filter__options">            
+        <div class="moj-filter__options">
             <button form="searchform" class="govuk-button" data-module="govuk-button" data-test-id="submit-button">
               Apply filters
             </button>
@@ -43,14 +45,16 @@ <h3 class="govuk-heading-s govuk-!-margin-bottom-0">Domain</h3>
               <fieldset class="govuk-fieldset">
                 <legend class="govuk-fieldset__legend govuk-fieldset__legend--m">Domain</legend>
                 <div class="govuk-checkboxes govuk-checkboxes--small" data-module="govuk-checkboxes">
-                  {% for option in domainlist%}
+                  {% for domain_option in form.domains %}
                       <div class="govuk-checkboxes__item">
-                          <input form="searchform" class="govuk-checkboxes__input" id="domain-{{ option|lower }}" name="domain" type="checkbox" value="{{ option.value }}" {% if option.value in selected_domain.keys %}checked{% endif %}>
-                          <label class="govuk-label govuk-checkboxes__label" for="domain-{{ option.value|lower }}">{{ option.label }}</label>
+                        {{ domain_option.tag}}
+                        <label class="govuk-label govuk-checkboxes__label" for="{{ domain_option.id_for_label }}">
+                          {{domain_option.choice_label}}
+                        </label>
                       </div>
                   {% endfor %}
                 </div>
-              </fieldset> 
+              </fieldset>
             </div>
         </div>
       </div>
diff --git a/templates/partial/pagination.html b/templates/partial/pagination.html
index bcebe556..552c2d4e 100644
--- a/templates/partial/pagination.html
+++ b/templates/partial/pagination.html
@@ -1,7 +1,8 @@
+{% load future %}
 <nav class="govuk-pagination" role="navigation" aria-label="Pagination">
     {% if page_obj.has_previous %}
     <div class="govuk-pagination__prev">
-      <a class="govuk-link govuk-pagination__link" href="{% url 'home:pagination' page=page_obj.previous_page_number %}" rel="prev">
+      <a class="govuk-link govuk-pagination__link" href="{% url 'home:pagination' page=page_obj.previous_page_number %}{% query_string clear_label=None clear_filter=None %}" rel="prev">
         <svg class="govuk-pagination__icon govuk-pagination__icon--prev" xmlns="http://www.w3.org/2000/svg" height="13" width="15" aria-hidden="true" focusable="false" viewBox="0 0 15 13">
           <path d="m6.5938-0.0078125-6.7266 6.7266 6.7441 6.4062 1.377-1.449-4.1856-3.9768h12.896v-2h-12.984l4.2931-4.293-1.414-1.414z"></path>
         </svg>
@@ -15,7 +16,7 @@
             {% else %}
                 <li class="govuk-pagination__item">
             {% endif %}
-                <a class="govuk-link govuk-pagination__link" href="{% url 'home:pagination' page=p %}?sortby={{sortby}}" aria-label="Page {{ p }}">
+                <a class="govuk-link govuk-pagination__link" href="{% url 'home:pagination' page=p %}{% query_string clear_label=None clear_filter=None new=None %}" aria-label="Page {{ p }}">
                     {{ p }}
                 </a>
                 </li>
@@ -26,9 +27,9 @@
     {% endfor %}
     {% if page_obj.has_next %}
     <div class="govuk-pagination__next">
-      <a class="govuk-link govuk-pagination__link" href="{% url 'home:pagination' page=page_obj.next_page_number %}" rel="next"> <span class="govuk-pagination__link-title">Next<span class="govuk-visually-hidden"> page</span></span> <svg class="govuk-pagination__icon govuk-pagination__icon--next" xmlns="http://www.w3.org/2000/svg" height="13" width="15" aria-hidden="true" focusable="false" viewBox="0 0 15 13">
+      <a class="govuk-link govuk-pagination__link" href="{% url 'home:pagination' page=page_obj.next_page_number %}{% query_string clear_label=None clear_filter=None value=None new=None %}" rel="next"> <span class="govuk-pagination__link-title">Next<span class="govuk-visually-hidden"> page</span></span> <svg class="govuk-pagination__icon govuk-pagination__icon--next" xmlns="http://www.w3.org/2000/svg" height="13" width="15" aria-hidden="true" focusable="false" viewBox="0 0 15 13">
           <path d="m8.107-0.0078125-1.4136 1.414 4.2926 4.293h-12.986v2h12.896l-4.1855 3.9766 1.377 1.4492 6.7441-6.4062-6.7246-6.7266z"></path>
         </svg></a>
     </div>
     {% endif %}
-    </nav>
\ No newline at end of file
+    </nav>
diff --git a/templates/partial/search_result.html b/templates/partial/search_result.html
index 958f534b..99d4ddd8 100644
--- a/templates/partial/search_result.html
+++ b/templates/partial/search_result.html
@@ -32,7 +32,7 @@ <h3 class="govuk-heading-m govuk-!-margin-bottom-2">
         <div class="govuk-summary-list__row">
           <dt class="govuk-summary-list__key">Domain name</dt>
           <dd class="govuk-summary-list__value">
-          {{result.metadata.domain.properties.name}}
+          {{result.metadata.domain_name}}
           </dd>
         </div>
         <div class="govuk-summary-list__row">
diff --git a/templates/partial/sort.html b/templates/partial/sort.html
new file mode 100644
index 00000000..d011e533
--- /dev/null
+++ b/templates/partial/sort.html
@@ -0,0 +1,17 @@
+<div class="govuk-form-group">
+    <fieldset class="govuk-fieldset">
+      <legend class="govuk-fieldset__legend govuk-fieldset__legend--s">
+        Sort results
+      </legend>
+      <div class="govuk-radios govuk-radios--inline govuk-radios--small" data-module="govuk-radios">
+        {% for radio in form.sort %}
+                <div class="govuk-radios__item">
+                    {{radio.tag}}
+                    <label class="govuk-label govuk-radios__label" for="{{ radio.id_for_label }}">
+                        {{radio.choice_label}}
+                    </label>
+                </div>
+            {% endfor %}
+        </div>
+    </fieldset>
+  </div>
diff --git a/templates/search.html b/templates/search.html
index 8173550e..148b01a5 100644
--- a/templates/search.html
+++ b/templates/search.html
@@ -10,7 +10,7 @@
         <div class="govuk-form-group">
           <h1 class="govuk-heading-xl">Find MOJ Data</h1>
           <div class="search-container">
-            <input name="query" class="govuk-input search-input" id="searchForm-search" type="search" value="{{query}}">
+            {{ form.query }}
             <button class="search-button" type="submit">
               <svg aria-hidden="true" class="search-icon" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" width="40" height="40"><path d="M25.7 24.8L21.9 21c.7-1 1.1-2.2 1.1-3.5 0-3.6-2.9-6.5-6.5-6.5S10 13.9 10 17.5s2.9 6.5 6.5 6.5c1.6 0 3-.6 4.1-1.5l3.7 3.7 1.4-1.4zM12 17.5c0-2.5 2-4.5 4.5-4.5s4.5 2 4.5 4.5-2 4.5-4.5 4.5-4.5-2-4.5-4.5z" fill="currentColor"></path>
               </svg><span class="govuk-visually-hidden">Search</span>
@@ -24,33 +24,7 @@ <h1 class="govuk-heading-xl">Find MOJ Data</h1>
   {% include "partial/filter.html" %}
   <div class="govuk-grid-column-two-thirds">
     <h2 class="govuk-heading-l govuk-!-display-inline-block">{{total_results|intcomma}} Results</h2>
-    <div class="govuk-form-group">
-      <fieldset class="govuk-fieldset">
-        <legend class="govuk-fieldset__legend govuk-fieldset__legend--s">
-          Sort results
-        </legend>
-        <div class="govuk-radios govuk-radios--inline govuk-radios--small" data-module="govuk-radios">
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" form="searchform" id="relevance" name="sortby" type="radio" value="relevance" {% if not sortby or sortby == "relevance" %} checked {% endif %} onchange="document.getElementById('searchform').submit();">
-            <label class="govuk-label govuk-radios__label" for="relevance">
-              Relevance
-            </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" form="searchform" id="ascending" name="sortby" type="radio" value="ascending" {% if sortby == "ascending" %} checked {% endif %} onchange="document.getElementById('searchform').submit();">
-            <label class="govuk-label govuk-radios__label" for="ascending">
-              Ascending
-            </label>
-          </div>
-          <div class="govuk-radios__item">
-            <input class="govuk-radios__input" form="searchform" id="descending" name="sortby" type="radio" value="descending" {% if sortby == "descending" %} checked {% endif %} onchange="document.getElementById('searchform').submit();">
-            <label class="govuk-label govuk-radios__label" for="descending">
-              Descending
-            </label>
-          </div>
-        </div>
-      </fieldset>
-    </div>
+      {% include "partial/sort.html" %}
       {% include "partial/search_result.html" %}
       {% include "partial/pagination.html" %}
     </div>
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/home/__init__.py b/tests/home/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/home/views/__init__.py b/tests/home/views/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/home/views/test_views.py b/tests/home/views/test_views.py
new file mode 100644
index 00000000..7d0dddf2
--- /dev/null
+++ b/tests/home/views/test_views.py
@@ -0,0 +1,95 @@
+from random import choice
+from unittest import skip
+from unittest.mock import MagicMock, patch
+
+from data_platform_catalogue.client import BaseCatalogueClient
+from data_platform_catalogue.search_types import (FacetOption, ResultType,
+                                                  SearchFacets, SearchResponse,
+                                                  SearchResult)
+from django.test import SimpleTestCase
+from django.urls import reverse
+from faker import Faker
+
+fake = Faker()
+
+
+def generate_page(page_size=20):
+    """
+    Generate a fake search page
+    """
+    results = []
+    for _ in range(page_size):
+        results.append(
+            SearchResult(
+                id=fake.unique.name(),
+                result_type=choice(
+                    (ResultType.DATA_PRODUCT, ResultType.TABLE)),
+                name=fake.name(),
+                description=fake.paragraphs(),
+            )
+        )
+    return results
+
+
+def generate_options(num_options=5):
+    """
+    Generate a list of options for the search facets
+    """
+    results = []
+    for _ in range(num_options):
+        results.append(
+            FacetOption(
+                value=fake.name(),
+                label=fake.name(),
+                count=fake.random_int(min=0, max=100),
+            )
+        )
+    return results
+
+
+class SearchViewTests(SimpleTestCase):
+    """
+    Test the view renders the correct context depending on query parameters and session
+    """
+
+    def setUp(self):
+        self.patcher = patch("home.views.get_catalogue_client")
+        mock_fn = self.patcher.start()
+        self.mock_client = MagicMock(spec=BaseCatalogueClient)
+        mock_fn.return_value = self.mock_client
+        self.mock_search_response(
+            page_results=generate_page(), total_results=100)
+        self.mock_search_facets_response(domains=generate_options())
+
+    def tearDown(self):
+        self.patcher.stop()
+
+    def mock_search_response(self, total_results=0, page_results=()):
+        search_response = SearchResponse(
+            total_results=total_results, page_results=page_results
+        )
+        self.mock_client.search.return_value = search_response
+
+    def mock_search_facets_response(self, domains):
+        self.mock_client.search_facets.return_value = SearchFacets(
+            {"domains": domains})
+
+    def test_renders_200(self):
+        response = self.client.get(reverse("home:search"), data={})
+        self.assertEqual(response.status_code, 200)
+
+    def test_exposes_results(self):
+        response = self.client.get(reverse("home:search"), data={})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(response.context["results"]), 20)
+
+    def test_exposes_empty_query(self):
+        response = self.client.get(reverse("home:search"), data={})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context["query"], "")
+
+    def test_exposes_query(self):
+        response = self.client.get(
+            reverse("home:search"), data={"query": "foo"})
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.context["query"], "foo")