diff --git a/backend/pkg/restapi/list/entries.go b/backend/pkg/restapi/list/entries.go
index bca4007..f8be63a 100644
--- a/backend/pkg/restapi/list/entries.go
+++ b/backend/pkg/restapi/list/entries.go
@@ -14,11 +14,15 @@ import (
 func Entries(w http.ResponseWriter, req *http.Request) {
 	queryParams := req.URL.Query()
 	offsetStr := queryParams.Get("offset")
+	limitStr := queryParams.Get("limit")
 	offset, err := strconv.Atoi(offsetStr)
 	if err != nil {
 		offset = 0
 	}
-	limit := 100
+	limit, err := strconv.Atoi(limitStr)
+	if err != nil {
+		limit = 100
+	}
 
 	result := make([]goshort.GoShort, 0)
 
diff --git a/docker/goshort b/docker/goshort
index 11de74d..d63ae44 100755
Binary files a/docker/goshort and b/docker/goshort differ