--- a/pkg/controllers/gauges.go	Thu Aug 22 10:54:08 2019 +0200
+++ b/pkg/controllers/gauges.go	Thu Aug 22 11:26:48 2019 +0200
@@ -31,8 +31,9 @@
 	"gonum.org/v1/gonum/stat"
 
 	"gemma.intevation.de/gemma/pkg/common"
-	"gemma.intevation.de/gemma/pkg/middleware"
 	"gemma.intevation.de/gemma/pkg/models"
+
+	mw "gemma.intevation.de/gemma/pkg/middleware"
 )
 
 const (
@@ -192,7 +193,7 @@
 
 	year, _ := strconv.Atoi(mux.Vars(req)["year"])
 
-	conn := middleware.GetDBConn(req)
+	conn := mw.GetDBConn(req)
 
 	ctx := req.Context()
 
@@ -282,7 +283,7 @@
 		return
 	}
 
-	conn := middleware.GetDBConn(req)
+	conn := mw.GetDBConn(req)
 
 	ctx := req.Context()
 
@@ -446,7 +447,7 @@
 func parseISRS(code string) (*models.Isrs, error) {
 	isrs, err := models.IsrsFromString(code)
 	if err != nil {
-		return nil, JSONError{
+		return nil, mw.JSONError{
 			Code:    http.StatusBadRequest,
 			Message: fmt.Sprintf("error: Invalid ISRS code: %v", err),
 		}
@@ -574,7 +575,7 @@
 	return values, nil
 }
 
-func nashSutcliffe(req *http.Request) (jr JSONResult, err error) {
+func nashSutcliffe(req *http.Request) (jr mw.JSONResult, err error) {
 
 	gauge := mux.Vars(req)["gauge"]
 
@@ -586,7 +587,7 @@
 	var when time.Time
 	if w := req.FormValue("when"); w != "" {
 		if when, err = common.ParseTime(w); err != nil {
-			err = JSONError{
+			err = mw.JSONError{
 				Code:    http.StatusBadRequest,
 				Message: fmt.Sprintf("error: wrong time format: %v", err),
 			}
@@ -601,7 +602,7 @@
 
 	var values []observedPredictedValues
 
-	if values, err = loadNashSutcliffeData(ctx, JSONConn(req), isrs, when); err != nil {
+	if values, err = loadNashSutcliffeData(ctx, mw.JSONConn(req), isrs, when); err != nil {
 		return
 	}
 
@@ -640,7 +641,7 @@
 		observed = observed[:0]
 	}
 
-	jr = JSONResult{
+	jr = mw.JSONResult{
 		Result: &coeffs{
 			When:   models.ImportTime{Time: when},
 			Coeffs: cs,
@@ -726,7 +727,7 @@
 	stmt.WriteString(selectWaterlevelsSQL)
 	filters.serialize(&stmt, &args)
 
-	conn := middleware.GetDBConn(req)
+	conn := mw.GetDBConn(req)
 
 	ctx := req.Context()