diff --git a/server/routes/water-quality/location-desc-option.route.js b/server/routes/water-quality/location-desc-option.route.js
index 299ab5ec..aa122c21 100644
--- a/server/routes/water-quality/location-desc-option.route.js
+++ b/server/routes/water-quality/location-desc-option.route.js
@@ -13,17 +13,7 @@ const handlers = {
   post: (request, h) => {
     const context = _getContext()
 
-    // const locationmapordesc = request.payload['location-map-or-desc']
-    //
-    // if (locationmapordesc === 'address') {
-    //   return h.view(Views.WATER_TYPE, { ...context })
-    // } else if (locationmapordesc === 'map') {
-    //   return h.view(Views.WATER_TYPE, { ...context })
-    // } else if (locationmapordesc === 'desc') {
-    //   return h.view(Views.FISHING_LOCATION, { ...context })
-    // }
-    //
-    return h.view(Views.WATER_TYPE_REPORTED, {
+    return h.view(Views.WATER_TYPE_WHEN, {
       ...context
     })
   }
diff --git a/server/routes/water-quality/location-map-or-desc.route.js b/server/routes/water-quality/location-map-or-desc.route.js
index 51c260b3..847ace5b 100644
--- a/server/routes/water-quality/location-map-or-desc.route.js
+++ b/server/routes/water-quality/location-map-or-desc.route.js
@@ -14,6 +14,7 @@ const handlers = {
     const context = _getContext()
 
     const locationmapordesc = request.payload['location-map-or-desc']
+
     if (locationmapordesc === 'address') {
       return h.view(Views.WATER_TYPE_LOCATION_ADDRESS_OPTION, { ...context })
     } else if (locationmapordesc === 'map') {