diff --git a/mapper/mapper.go b/mapper/mapper.go
index b462aa8..01409d2 100644
--- a/mapper/mapper.go
+++ b/mapper/mapper.go
@@ -24,6 +24,7 @@ func CreateGetFeedback(req *http.Request, basePage core.Page, validationErrors [
 	var services = make(map[string]string)
 	services["cmd"] = "customising data by applying filters"
 	services["dev"] = "ONS developer"
+	services["search"] = "search"
 	serviceDescription := services[req.URL.Query().Get("service")]
 
 	p.Language = lang
@@ -69,7 +70,7 @@ func CreateGetFeedback(req *http.Request, basePage core.Page, validationErrors [
 			{
 				Input: core.Input{
 					ID:        "specific-page",
-					IsChecked: ff.Type == "A specific page" || ff.URL != "",
+					IsChecked: ff.Type == "A specific page" || (ff.URL != "" && serviceDescription == ""),
 					Label: core.Localisation{
 						LocaleKey: "FeedbackASpecificPage",
 						Plural:    1,
@@ -81,7 +82,12 @@ func CreateGetFeedback(req *http.Request, basePage core.Page, validationErrors [
 					Autocomplete: "url",
 					ID:           "page-url-field",
 					Name:         "url",
-					Value:        ff.URL,
+					Value: func() string {
+						if serviceDescription != "" {
+							return ""
+						}
+						return ff.URL
+					}(),
 					Label: core.Localisation{
 						LocaleKey: "FeedbackWhatEnterURL",
 						Plural:    1,
@@ -107,7 +113,7 @@ func CreateGetFeedback(req *http.Request, basePage core.Page, validationErrors [
 			core.Radio{
 				Input: core.Input{
 					ID:        "new-service",
-					IsChecked: ff.Type == "new-service",
+					IsChecked: true,
 					Label: core.Localisation{
 						Text: helper.Localise("FeedbackWhatOptNewService", lang, 1, serviceDescription),
 					},