diff --git a/general_server/hanle_multi.go b/general_server/hanle_multi.go
index ca20f89..0161b73 100644
--- a/general_server/hanle_multi.go
+++ b/general_server/hanle_multi.go
@@ -70,14 +70,19 @@ func (s *GeneralServer) Handle(w http.ResponseWriter, r *http.Request) {
 	s.w = w
 	s.r = r
 	serverReqApiVer := chi.URLParam(r, "ver")
-
-	s.log.Info("Received request",
-		slog.String("remote", r.RemoteAddr),
-		slog.String("method", r.Method),
-		slog.String("url", r.URL.String()),
-		slog.String("requested-version", serverReqApiVer),
+	log := s.log.With(
+		slog.Group("request",
+			slog.String("version", serverReqApiVer),
+			slog.String("url", s.r.URL.String()),
+			slog.String("method", s.r.Method),
+		),
+		slog.Group("connection",
+			slog.String("remote", s.r.RemoteAddr),
+		),
 	)
 
+	s.log.Info("Received request")
+
 	if srv, ok := s.servers[serversApiVer(serverReqApiVer)]; ok {
 		srv.Handle(w, r)
 		return
@@ -94,10 +99,7 @@ func (s *GeneralServer) Handle(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	s.log.Error("HTTP request error: unsupported API version",
-		slog.String("remote", s.r.RemoteAddr),
-		slog.String("method", s.r.Method),
-		slog.String("url", s.r.URL.String()),
+	log.Error("HTTP request error: unsupported API version",
 		slog.Int("status", http.StatusBadRequest))
 	s.writeJSONError(http.StatusBadRequest, "unsupported API version")
 }
@@ -107,13 +109,19 @@ func (s *GeneralServer) HandleList(w http.ResponseWriter, r *http.Request) {
 	s.r = r
 	serverReqApiVer := chi.URLParam(r, "ver")
 
-	s.log.Info("Received request",
-		slog.String("remote", r.RemoteAddr),
-		slog.String("method", r.Method),
-		slog.String("url", r.URL.String()),
-		slog.String("requested-version", serverReqApiVer),
+	log := s.log.With(
+		slog.Group("request",
+			slog.String("version", serverReqApiVer),
+			slog.String("url", s.r.URL.String()),
+			slog.String("method", s.r.Method),
+		),
+		slog.Group("connection",
+			slog.String("remote", s.r.RemoteAddr),
+		),
 	)
 
+	log.Info("Received request")
+
 	if srv, ok := s.servers[serversApiVer(serverReqApiVer)]; ok {
 		srv.HandleList(w, r)
 		return
@@ -121,7 +129,7 @@ func (s *GeneralServer) HandleList(w http.ResponseWriter, r *http.Request) {
 
 	if slices.Contains(s.cfg.Layers, serverReqApiVer) {
 		if srv, ok := s.servers[serversApiVer(s.cfg.LatestVer)]; ok {
-			s.log.Info("Using latest version under custom layer",
+			log.Info("Using latest version under custom layer",
 				slog.String("layer", serverReqApiVer),
 				slog.String("fallback-version", s.cfg.LatestVer),
 			)
@@ -130,22 +138,19 @@ func (s *GeneralServer) HandleList(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	s.log.Error("HTTP request error: unsupported API version",
-		slog.String("remote", s.r.RemoteAddr),
-		slog.String("method", s.r.Method),
-		slog.String("url", s.r.URL.String()),
+	log.Error("HTTP request error: unsupported API version",
 		slog.Int("status", http.StatusBadRequest))
 	s.writeJSONError(http.StatusBadRequest, "unsupported API version")
 }
 
-func (s *GeneralServer) _errNotFound() {
-	s.writeJSONError(http.StatusBadRequest, "invalid request")
-	s.log.Error("HTTP request error",
-		slog.String("remote", s.r.RemoteAddr),
-		slog.String("method", s.r.Method),
-		slog.String("url", s.r.URL.String()),
-		slog.Int("status", http.StatusBadRequest))
-}
+// func (s *GeneralServer) _errNotFound() {
+// 	s.writeJSONError(http.StatusBadRequest, "invalid request")
+// 	s.log.Error("HTTP request error",
+// 		slog.String("remote", s.r.RemoteAddr),
+// 		slog.String("method", s.r.Method),
+// 		slog.String("url", s.r.URL.String()),
+// 		slog.Int("status", http.StatusBadRequest))
+// }
 
 func (s *GeneralServer) writeJSONError(status int, msg string) {
 	s.w.Header().Set("Content-Type", "application/json")
diff --git a/sv1/handle_com.go b/sv1/handle_com.go
index c972ad9..3eb7298 100644
--- a/sv1/handle_com.go
+++ b/sv1/handle_com.go
@@ -15,7 +15,7 @@ func (h *HandlerV1) _handle() {
 	uuid16 := h.newUUID()
 	log := h.log.With(
 		slog.Group("request",
-			slog.String("version", "v1"),
+			slog.String("version", h.GetVersion()),
 			slog.String("url", h.r.URL.String()),
 			slog.String("method", h.r.Method),
 		),
diff --git a/sv1/handle_list.go b/sv1/handle_list.go
index 85c6e00..67f3c2d 100644
--- a/sv1/handle_list.go
+++ b/sv1/handle_list.go
@@ -15,7 +15,7 @@ func (h *HandlerV1) _handleList() {
 	uuid16 := h.newUUID()
 	log := h.log.With(
 		slog.Group("request",
-			slog.String("version", "v1"),
+			slog.String("version", h.GetVersion()),
 			slog.String("url", h.r.URL.String()),
 			slog.String("method", h.r.Method),
 		),