--- a/pkg/controllers/search.go	Mon Sep 24 16:34:38 2018 +0200
+++ b/pkg/controllers/search.go	Mon Sep 24 16:39:53 2018 +0200
@@ -41,10 +41,11 @@
 		return
 	}
 
-	// Handle search for river kilometre:
+	var result string
 
 	m := rkmRegex.FindStringSubmatch(s.SearchString)
 	if len(m) != 0 {
+		// Handle search for river kilometre:
 		var hectometre int
 		if hectometre, err = strconv.Atoi(m[1]); err != nil {
 			return
@@ -59,34 +60,25 @@
 			hectometre += h
 		}
 
-		var result string
-
 		err = db.QueryRowContext(
 			req.Context(),
 			searchHectometreSQL,
 			hectometre,
 		).Scan(&result)
-
-		if err != nil {
-			return
-		}
-
-		jr.Result = strings.NewReader(result)
 	} else {
-		var result string
-
+		// Hande search for bottlencks:
 		err = db.QueryRowContext(
 			req.Context(),
 			searchBottleneckSQL,
 			"%"+s.SearchString+"%",
 		).Scan(&result)
+	}
 
-		if err != nil {
-			return
-		}
+	if err != nil {
+		return
+	}
 
-		jr.Result = strings.NewReader(result)
-	}
+	jr.Result = strings.NewReader(result)
 
 	return
 }