diff --git a/src/UI/History/AggregateImages.svelte b/src/UI/History/AggregateImages.svelte
index 020c8285a8..faf9cc8527 100644
--- a/src/UI/History/AggregateImages.svelte
+++ b/src/UI/History/AggregateImages.svelte
@@ -15,13 +15,13 @@
     Promise.all(features.map((f) => downloader.downloadHistory(f.properties.id)))
   )
   let imageKeys = new Set(
-    ...["panoramax", "image:streetsign", "image:menu"].map((k) => {
+    [].concat(...["panoramax", "image:streetsign", "image:menu", "toilets:wheelchair:panoramax"].map((k) => {
       const result: string[] = [k]
       for (let i = 0; i < 10; i++) {
         result.push(k + ":" + i)
       }
       return result
-    })
+    }))
   )
   let usernamesSet = new Set(onlyShowUsername)
   let allDiffs: Store<
@@ -42,7 +42,7 @@
 {:else if $addedImages.length === 0}
   No images added by this contributor
 {:else}
-  <div class="flex">
+  <div class="flex gap-x-2 flex-wrap">
     {#each $addedImages as imgDiff}
       <div class="h-48 w-48">
         <AttributedPanoramaxImage hash={imgDiff.value} />
diff --git a/src/UI/Image/AttributedImage.svelte b/src/UI/Image/AttributedImage.svelte
index 33a304fc63..20a1ddf3ba 100644
--- a/src/UI/Image/AttributedImage.svelte
+++ b/src/UI/Image/AttributedImage.svelte
@@ -45,7 +45,7 @@
   let showBigPreview = new UIEventSource(false)
   onDestroy(
     showBigPreview.addCallbackAndRun((shown) => {
-      state.guistate.setPreviewedImage(shown ? image : undefined)
+      state?.guistate?.setPreviewedImage(shown ? image : undefined)
     })
   )
   if (previewedImage) {