diff --git a/pkg/booking/public.go b/pkg/booking/public.go
index 1104e7d..2a67cb9 100644
--- a/pkg/booking/public.go
+++ b/pkg/booking/public.go
@@ -38,6 +38,7 @@ func (h *PublicHandler) Handler(user *auth.User, company *auth.Company, conn *da
 			switch r.Method {
 			case http.MethodGet:
 				page := newPublicPage(r.Context(), company, conn, user.Locale)
+				_ = page.Form.Parse(r) // Get query parameters, if any
 				page.MustRender(w, r, user, company, conn)
 			case http.MethodPost:
 				makeReservation(w, r, user, company, conn)
diff --git a/web/templates/public/campsite/type.gohtml b/web/templates/public/campsite/type.gohtml
index dbb2a79..a5840f3 100644
--- a/web/templates/public/campsite/type.gohtml
+++ b/web/templates/public/campsite/type.gohtml
@@ -35,18 +35,18 @@
 
     <div class="campsite_type_booking">
         <form action="/{{ currentLocale }}/booking" method="get">
-            <input type="hidden" name="type" value="{{ .Slug }}">
+            <input type="hidden" name="campsite_type" value="{{ .Slug }}">
             <fieldset>
                 <label>
                     {{( pgettext "Check-in Date" "input")}}
                     <br>
-                    <input name="checkin_date" type="date" required>
+                    <input name="arrival_date" type="date" required>
                     <br>
                 </label>
                 <label>
                     {{( pgettext "Check-out Date" "input")}}
                     <br>
-                    <input name="checkout_date" type="date" required>
+                    <input name="departure_date" type="date" required>
                     <br>
                 </label>
             </fieldset>