diff --git a/package.json b/package.json
index 4cc60b0..ec338f0 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "cf-release": "cd misc/cloudflare-workers && wrangler deploy"
   },
   "dependencies": {
-    "@hiogawa/react-server": "0.1.15",
+    "@hiogawa/react-server": "0.1.16",
     "react": "18.3.0-canary-14898b6a9-20240318",
     "react-dom": "18.3.0-canary-14898b6a9-20240318",
     "react-server-dom-webpack": "18.3.0-canary-14898b6a9-20240318"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ecc4157..2ba457d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,8 +6,8 @@ settings:
 
 dependencies:
   '@hiogawa/react-server':
-    specifier: 0.1.15
-    version: 0.1.15(react-dom@18.3.0-canary-14898b6a9-20240318)(react-server-dom-webpack@18.3.0-canary-14898b6a9-20240318)(react@18.3.0-canary-14898b6a9-20240318)(vite@5.2.8)
+    specifier: 0.1.16
+    version: 0.1.16(react-dom@18.3.0-canary-14898b6a9-20240318)(react-server-dom-webpack@18.3.0-canary-14898b6a9-20240318)(react@18.3.0-canary-14898b6a9-20240318)(vite@5.2.8)
   react:
     specifier: 18.3.0-canary-14898b6a9-20240318
     version: 18.3.0-canary-14898b6a9-20240318
@@ -496,8 +496,8 @@ packages:
       mime-types: 2.1.35
     dev: true
 
-  /@hiogawa/react-server@0.1.15(react-dom@18.3.0-canary-14898b6a9-20240318)(react-server-dom-webpack@18.3.0-canary-14898b6a9-20240318)(react@18.3.0-canary-14898b6a9-20240318)(vite@5.2.8):
-    resolution: {integrity: sha512-rh5CUa0JEA+WhB3I4vkYHRNL7t6r45X4kXWRqcihi3Gc2mQoXCpHyMt6Ido+PsQMVOyB9NW4DSiWHyVEgJuu3Q==}
+  /@hiogawa/react-server@0.1.16(react-dom@18.3.0-canary-14898b6a9-20240318)(react-server-dom-webpack@18.3.0-canary-14898b6a9-20240318)(react@18.3.0-canary-14898b6a9-20240318)(vite@5.2.8):
+    resolution: {integrity: sha512-hqEuG/x2PFUejNYuZy8PaK9L44DJ+6eoHuRv67i80Ot7wSRIV+oxzcjmmD9RSstsRM4GtK57y2ykj+wl31377w==}
     peerDependencies:
       react: 18.3.0-canary-14898b6a9-20240318
       react-dom: 18.3.0-canary-14898b6a9-20240318
diff --git a/src/routes/contacts/[contactId]/edit/page.tsx b/src/routes/contacts/[contactId]/edit/page.tsx
index 47205c8..281e6ea 100644
--- a/src/routes/contacts/[contactId]/edit/page.tsx
+++ b/src/routes/contacts/[contactId]/edit/page.tsx
@@ -4,7 +4,7 @@ import { actionUpdateContact } from "../../../_action";
 import { BackButton } from "./_client";
 
 export default async function EditContact(props: PageProps) {
-  const contact = await getContact(decodeURI(props.params["contactId"]));
+  const contact = await getContact(props.params["contactId"]);
   if (!contact) {
     throw createError({ status: 404 });
   }
diff --git a/src/routes/contacts/[contactId]/page.tsx b/src/routes/contacts/[contactId]/page.tsx
index f0f9b1a..fb3c982 100644
--- a/src/routes/contacts/[contactId]/page.tsx
+++ b/src/routes/contacts/[contactId]/page.tsx
@@ -4,8 +4,7 @@ import { Link } from "@hiogawa/react-server/client";
 import { actionDeleteContact, actoinFavorite } from "../../_action";
 
 export default async function Contact(props: PageProps) {
-  // TODO: fix decoding
-  const contact = await getContact(decodeURI(props.params["contactId"]));
+  const contact = await getContact(props.params["contactId"]);
   if (!contact) {
     throw createError({ status: 404 });
   }
diff --git a/src/routes/layout.tsx b/src/routes/layout.tsx
index c5d9160..e2cca91 100644
--- a/src/routes/layout.tsx
+++ b/src/routes/layout.tsx
@@ -47,6 +47,7 @@ export default async function Layout(props: LayoutProps) {
               <ul>
                 {contacts.map((contact) => (
                   <li key={contact.id}>
+                    {/* TODO: navlink not working on initial render? */}
                     {/* NOTE: functional `className` prop cannot used for server/client boundary */}
                     <NavLink href={`/contacts/${contact.id}`}>
                       {contact.first || contact.last ? (