diff --git a/opentech/apply/utils/views.py b/opentech/apply/utils/views.py
index 41a7a01de17a628e7cc4fa8650231a48970786c8..79684bd0bf56b778e2471e570f526b109cd97659 100644
--- a/opentech/apply/utils/views.py
+++ b/opentech/apply/utils/views.py
@@ -7,6 +7,8 @@ from django.views.generic.edit import ModelFormMixin, ProcessFormView
 
 
 def page_not_found(request, exception=None, template_name='apply/404.html'):
+    if not request.user.is_authenticated:
+        template_name='404.html'
     return defaults.page_not_found(request, exception, template_name)
 
 
diff --git a/opentech/public/mailchimp/templates/mailchimp/newsletter_signup.html b/opentech/public/mailchimp/templates/mailchimp/newsletter_signup.html
index 1bd9984c700dee25081225c9309e896eb011efed..d45a2dfd5298a870f4c0c8c42a49533f8aebf4db 100644
--- a/opentech/public/mailchimp/templates/mailchimp/newsletter_signup.html
+++ b/opentech/public/mailchimp/templates/mailchimp/newsletter_signup.html
@@ -1,5 +1,5 @@
 <h4>Get the latest internet freedom news</h4>
-<form class="form" action="{% url "newsletter:subscribe" %}" method="post">
+<form class="form" action="{{ PUBLIC_SITE.root_url }}{% url "newsletter:subscribe" %}" method="post">
     <div>
         {% for field in newsletter_form %}
         <label for="{{ field.id_for_label }}"{% if field.field.required %} required{% endif %}>
diff --git a/opentech/public/search/views.py b/opentech/public/search/views.py
index 63031455fffca994a04892891a63b22de1fa91d3..a3aa058ae5361db6acfb7cd267ee70bd73ff02d9 100644
--- a/opentech/public/search/views.py
+++ b/opentech/public/search/views.py
@@ -1,11 +1,17 @@
 from django.conf import settings
 from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
+from django.http import Http404
 from django.shortcuts import render
 from wagtail.core.models import Page
 from wagtail.search.models import Query
 
+from opentech.public.home.models import HomePage
+
 
 def search(request):
+    if request.site != HomePage.objects.first().get_site():
+        raise Http404
+
     search_query = request.GET.get('query', None)
     page = request.GET.get('page', 1)
 
diff --git a/opentech/templates/base.html b/opentech/templates/base.html
index 94e1cd306d2ef3fa48167831508a0af03cccee3a..0844af725b963c8d288c791f1eeea958e0afb73d 100644
--- a/opentech/templates/base.html
+++ b/opentech/templates/base.html
@@ -129,7 +129,7 @@
                 </div>
 
                 <div class="header__search">
-                    <form action="{% url 'search' %}" method="get" role="search" class="form form--header-search-desktop">
+                    <form action="{{ PUBLIC_SITE.root_url }}{% url 'search' %}" method="get" role="search" class="form form--header-search-desktop">
                         <button class="button" type="submit" aria-label="Search">
                             <svg class="icon icon--magnifying-glass icon--search"><use xlink:href="#magnifying-glass"></use></svg>
                         </button>
diff --git a/opentech/urls.py b/opentech/urls.py
index de6766aa9da4cd4a0a353d67895d696385756bc9..e6845757630e342d14af0be4b2e95fdb6cd03a13 100644
--- a/opentech/urls.py
+++ b/opentech/urls.py
@@ -34,6 +34,7 @@ urlpatterns = [
     path('documents/', include(wagtaildocs_urls)),
     path('sitemap.xml', sitemap),
     path('', include((user_urls, 'users_public'))),
+    path('', include(public_urls)),
     path('', include('social_django.urls', namespace='social')),
     path('tinymce/', include('tinymce.urls')),
     path('select2/', include('django_select2.urls')),
@@ -75,11 +76,3 @@ if settings.DEBUG and settings.DEBUGTOOLBAR:
 
 
 base_urlpatterns = [*urlpatterns]
-
-
-# Add in URLs only available to the public site
-# Place before the wagtail urls without mutating the object
-urlpatterns.insert(
-    -1,
-    *apply_cache_control(path('', include(public_urls)))
-)