diff --git a/src/pages/public/account/publicnet.tsx b/src/pages/public/account/publicnet.tsx
index c3c525b..aab7ee2 100644
--- a/src/pages/public/account/publicnet.tsx
+++ b/src/pages/public/account/publicnet.tsx
@@ -525,11 +525,11 @@ const PublicNet: FC<Props> = ({ id }) => {
                         <ul className="text-small condensed">
                           {information?.entries &&
                             Object.keys(information?.entries).map(
-                              (entry, key) => {
+                              (entry: string, key: number) => {
                                 const { processedKey, processedValue } =
                                   processKeys(
                                     entry,
-                                    information?.entries[entry]
+                                    information.entries[entry]
                                   );
                                 return (
                                   <li className="word-break" key={key}>
diff --git a/src/pages/public/assets/AssetsListItem.tsx b/src/pages/public/assets/AssetsListItem.tsx
index 5016f4f..28c48bb 100644
--- a/src/pages/public/assets/AssetsListItem.tsx
+++ b/src/pages/public/assets/AssetsListItem.tsx
@@ -35,11 +35,12 @@ const AssetsListItem: FC<Props> = ({ item, tags }) => {
       <div>
         <b>
           <a
-            title={item?.issuer}
-            aria-label={item?.issuer}
+            title={item?.code}
+            aria-label={item?.code}
             className="account-address"
             href={`https://stellar.expert/explorer/${net}/asset/${item?.code}-${item?.issuer}`}
             style={{ marginRight: "1em" }}
+            target="_blank"
           >
             <span className="account-key" style={{ fontSize: "1.6rem" }}>
               {item?.code}
@@ -64,7 +65,7 @@ const AssetsListItem: FC<Props> = ({ item, tags }) => {
         title={item?.issuer}
         aria-label={item?.issuer}
         className="account-address"
-        href={`https://stellar.expert/explorer/${net}/asset/${item?.code}-${item?.issuer}`}
+        href={`/${net}/account?id=${item?.issuer}`}
         style={{ marginRight: "1em" }}
       >
         <span className="account-key" style={{ fontSize: "1.6rem" }}>
diff --git a/src/shared/lib/processKeys/index.ts b/src/shared/lib/processKeys/index.ts
index c5b6563..3240939 100644
--- a/src/shared/lib/processKeys/index.ts
+++ b/src/shared/lib/processKeys/index.ts
@@ -38,11 +38,9 @@ const processKeys = (
     if (patterns.some((pattern) => pattern.test(key))) {
       switch (type) {
         case "accounts":
-          processedValue = stellarSdk.StrKey.encodeEd25519PublicKey(
-            decodedValue
-          )
-            ? `<a href="/public/account?id=${decodedValue}">Ready</a>`
-            : `<a href="#">${decodedValue}</a>`;
+          processedValue = stellarSdk.StrKey.isValidEd25519PublicKey(decodedValue)
+            ? `<a href="/public/account?id=${decodedValue}">${decodedValue}</a>`
+            : `<span>${decodedValue}</span>`;
           break;
         case "links":
           processedValue = `<a target="_blank" href="${decodedValue}">${decodedValue}</a>`;