diff --git a/packages/app/src/Element/Tabs.tsx b/packages/app/src/Element/Tabs.tsx
index 661ea67d..aff617b5 100644
--- a/packages/app/src/Element/Tabs.tsx
+++ b/packages/app/src/Element/Tabs.tsx
@@ -32,7 +32,7 @@ const Tabs = ({ tabs, tab, setTab }: TabsProps) => {
   return (
     <div className="tabs" ref={horizontalScroll}>
       {tabs.map(t => (
-        <TabElement tab={tab} setTab={setTab} t={t} />
+        <TabElement key={t.value} tab={tab} setTab={setTab} t={t} />
       ))}
     </div>
   );
diff --git a/packages/app/src/Element/Text.tsx b/packages/app/src/Element/Text.tsx
index 0e13507c..eba63cc2 100644
--- a/packages/app/src/Element/Text.tsx
+++ b/packages/app/src/Element/Text.tsx
@@ -81,15 +81,13 @@ export default function Text({ content, tags, creator }: TextProps) {
                   }
                   case "e": {
                     const eText = hexToBech32("note", ref.Event).substring(0, 12);
-                    return ref.Event ? (
+                    return (
                       <Link
-                        to={eventLink(ref.Event)}
+                        to={eventLink(ref.Event ?? "")}
                         onClick={e => e.stopPropagation()}
                         state={{ from: location.pathname }}>
                         #{eText}
                       </Link>
-                    ) : (
-                      ""
                     );
                   }
                   case "t": {
diff --git a/packages/app/src/Feed/EventPublisher.ts b/packages/app/src/Feed/EventPublisher.ts
index b8c53a4b..ce8c94f3 100644
--- a/packages/app/src/Feed/EventPublisher.ts
+++ b/packages/app/src/Feed/EventPublisher.ts
@@ -76,7 +76,7 @@ export default function useEventPublisher() {
     };
     const content = msg
       .replace(/@npub[a-z0-9]+/g, replaceNpub)
-      .replace(/note1[acdefghjklmnpqrstuvwxyz023456789]{58}/g, replaceNoteId)
+      .replace(/note[a-z0-9]+/g, replaceNoteId)
       .replace(HashtagRegex, replaceHashtag);
     ev.Content = content;
   }
diff --git a/packages/app/src/Pages/settings/Preferences.tsx b/packages/app/src/Pages/settings/Preferences.tsx
index 1a34f873..f884e866 100644
--- a/packages/app/src/Pages/settings/Preferences.tsx
+++ b/packages/app/src/Pages/settings/Preferences.tsx
@@ -149,9 +149,9 @@ const PreferencesPage = () => {
         <div>
           <input
             type="number"
-            defaultValue={perf.defaultZapAmount}
+            value={perf.defaultZapAmount}
             min={1}
-            onChange={e => dispatch(setPreferences({ ...perf, defaultZapAmount: parseInt(e.target.value || "0") }))}
+            onChange={e => dispatch(setPreferences({ ...perf, defaultZapAmount: parseInt(e.target.value) }))}
           />
         </div>
       </div>
@@ -184,10 +184,10 @@ const PreferencesPage = () => {
         <div>
           <input
             type="number"
-            defaultValue={perf.fastZapDonate * 100}
+            value={perf.fastZapDonate * 100}
             min={0}
             max={100}
-            onChange={e => dispatch(setPreferences({ ...perf, fastZapDonate: parseInt(e.target.value || "0") / 100 }))}
+            onChange={e => dispatch(setPreferences({ ...perf, fastZapDonate: parseInt(e.target.value) / 100 }))}
           />
         </div>
       </div>