diff --git a/app/src/components/SettingsDrawer/TimeLocale.tsx b/app/src/components/SettingsDrawer/TimeLocale.tsx
index 2e02909..08040bb 100644
--- a/app/src/components/SettingsDrawer/TimeLocale.tsx
+++ b/app/src/components/SettingsDrawer/TimeLocale.tsx
@@ -6,6 +6,13 @@ import { connect } from 'react-redux'
 import { Input, InputLabel, MenuItem, Select, Theme } from '@material-ui/core'
 import { settingsActions } from '../../actions'
 import { withStyles } from '@material-ui/styles'
+
+function importAll(r: any) {
+  r.keys().forEach(r);
+}
+// @ts-expect-error -- webpack require
+importAll(require.context('moment/locale', true, /\.js$/));
+
 const moment = require('moment')
 
 interface Props {
diff --git a/events/EventSystem/Rpc.ts b/events/EventSystem/Rpc.ts
index e6a59e3..ae94448 100644
--- a/events/EventSystem/Rpc.ts
+++ b/events/EventSystem/Rpc.ts
@@ -13,16 +13,14 @@ export class Rpc {
         return new Promise((resolve, reject) => {
             let id = v4();
 
-            let responseEvent: Event<any> = { topic: `${event.topic}/response` };
+            let responseEvent: Event<any> = { topic: `${event.topic}/response/${id}` };
             let requestEvent: Event<any> = { topic: `${event.topic}/request` };
             let callback = (result: { id: string; payload: RpcResponse; error: unknown }) => {
                 this.participant.unsubscribe(responseEvent as any, callback);
-                if (result.id === id) {
-                    if (result.error) {
-                        reject(result.error)
-                    } else {
-                        resolve(result.payload);
-                    }
+                if (result.error) {
+                    reject(result.error)
+                } else {
+                    resolve(result.payload);
                 }
                 console.log("received", result)
             };
@@ -47,8 +45,9 @@ export class Rpc {
             } catch (e) {
                 error = e
             }
-            console.log("Responding with", payload, error)
-            this.participant.emit({ topic: `${event.topic}/response` }, { id: (request as any).id, payload, error });
+            const id = (request as any).id
+            console.log(`${event.topic}/response/${id}`, payload, error)
+            this.participant.emit({ topic: `${event.topic}/response/${id}` }, { id, payload, error });
         });
     }
 }