diff --git a/backend/main.go b/backend/main.go
index 0283d66..19cdc7e 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -37,6 +37,7 @@ func main() {
 		log.Fatal(err)
 	}
 
+	server.DebugJSON = config.DebugJSON
 	templates.DebugTemplates = config.DebugTemplates
 
 	var world *model.DfWorld
diff --git a/backend/server/config.go b/backend/server/config.go
index bef87ee..dc313d6 100644
--- a/backend/server/config.go
+++ b/backend/server/config.go
@@ -13,6 +13,7 @@ type Config struct {
 	LastPath       string
 	LastFile       string
 	DebugTemplates bool `json:"DebugTemplates,omitempty"`
+	DebugJSON      bool `json:"DebugJSON,omitempty"`
 }
 
 func LoadConfig(path string) (*Config, error) {
diff --git a/backend/server/templates.go b/backend/server/templates.go
index 283133e..b784b12 100644
--- a/backend/server/templates.go
+++ b/backend/server/templates.go
@@ -12,9 +12,17 @@ import (
 	"github.com/robertjanetzko/LegendsBrowser2/backend/util"
 )
 
+var DebugJSON = false
+
 func (srv *DfServer) LoadTemplates() {
 	functions := template.FuncMap{
-		"json": util.Json,
+		"json": func(obj any) template.HTML {
+			if !DebugJSON {
+				return ""
+			} else {
+				return util.Json(obj)
+			}
+		},
 		"check": func(condition bool, v any) any {
 			if condition {
 				return v
diff --git a/backend/templates/events.html b/backend/templates/events.html
index 8fbcff9..ba12e1f 100644
--- a/backend/templates/events.html
+++ b/backend/templates/events.html
@@ -1,7 +1,7 @@
 <ul class="mb-0">
     {{- range $event := .Events }}
-    <li>
-        [{{ $event.Id }}] In {{ time $event.Year $event.Seconds72 }},
+    <li data-event-id="{{ $event.Id }}">
+        In {{ time $event.Year $event.Seconds72 }},
         {{ html ($event.Details.Html ($.Context.WithEvent $event)) }}
         {{ if ne .Collection -1 }} <a class="collection" href="/collection/{{.Collection}}"><i
                 class="fa-solid fa-magnifying-glass fa-xs"></i></a>{{end}}