diff --git a/functions/custom_views.py b/functions/custom_views.py
index 9cfff4a9..00594d7c 100644
--- a/functions/custom_views.py
+++ b/functions/custom_views.py
@@ -343,9 +343,7 @@ class ExpoSearchView(ListView):
         if self.request.GET:
             form = self.search_form(self.request.GET)
             if form.is_valid():
-                form.data_with_parents = form.get_form_data()
-                context['form_data_with_parents'] = form.data_with_parents
-
+                form.data_with_parents = form.get_form_data()                
         else:
             form = self.search_form()
 
diff --git a/proj/views.py b/proj/views.py
index bbc0adc0..e9904df3 100644
--- a/proj/views.py
+++ b/proj/views.py
@@ -16,12 +16,14 @@ from functions.custom_views import ExpoListView
 from accounts.forms import RegistrationCompleteForm
 
 def expo_context(request):
-    cont = {'theme_search_form': ThemeSearch(), 'search_form': ExpositionSearchForm(), 'expo_catalog': Exposition.catalog,
+    cont = {'theme_search_form': ThemeSearch(), 'expo_catalog': Exposition.catalog,
             'book_aid': settings.BOOKING_AID}
 
     user = request.user
     if not user.is_anonymous() and not user.url:
         cont.update({'reg_complete': RegistrationCompleteForm(instance=user)})
+    if not request.GET:
+        cont.update({'search_form': ExpositionSearchForm()})
 
 
     return cont
diff --git a/templates/client/includes/catalog_search.html b/templates/client/includes/catalog_search.html
index 12bdba09..444680e3 100644
--- a/templates/client/includes/catalog_search.html
+++ b/templates/client/includes/catalog_search.html
@@ -115,7 +115,7 @@
 	EXPO.searchBlock.init({
 		formId: 'search-block-form',
 		modalTriggerClass:'search-modal-open',
-		searchData:'{{ form_data_with_parents|safe }}',
+		searchData:'{{ search_form.data_with_parents|safe }}',
 		closerText: closerText,
 		closerTextSingle: closerTextSingle,
 		place:{