diff --git a/frontend/src/components/NewSubscription.js b/frontend/src/components/NewSubscription.js
index e921e773..c4bd077d 100644
--- a/frontend/src/components/NewSubscription.js
+++ b/frontend/src/components/NewSubscription.js
@@ -73,11 +73,11 @@ const _NewSubscription = ({
     (props) => {
       props.label = "Address";
       if (
-        subscriptionAdressFormatRadio.startsWith("tags") &&
+        subscriptionAdressFormatRadio.startsWith("tag") &&
         radioState != "ethereum_whalewatch"
       ) {
         props.address = subscriptionAdressFormatRadio;
-        props.label = "tags: NFTs";
+        props.label = "Tag";
       }
 
       createSubscription.mutate({
@@ -165,7 +165,6 @@ const _NewSubscription = ({
               (addition_selects) => {
                 const radio = getRadioPropsSubscription({
                   value: addition_selects,
-                  isDisabled: addition_selects.startsWith("tag"),
                 });
                 return (
                   <RadioCard
diff --git a/frontend/src/components/SubscriptionsList.js b/frontend/src/components/SubscriptionsList.js
index 13b50dc5..d398891f 100644
--- a/frontend/src/components/SubscriptionsList.js
+++ b/frontend/src/components/SubscriptionsList.js
@@ -21,6 +21,11 @@ import { useSubscriptions } from "../core/hooks";
 import ConfirmationRequest from "./ConfirmationRequest";
 import ColorSelector from "./ColorSelector";
 
+const mapper = {
+  "tag:nfts": "NFTs",
+  "input:address": "Address",
+};
+
 const SubscriptionsList = ({ emptyCTA }) => {
   const {
     subscriptionsCache,
@@ -94,7 +99,11 @@ const SubscriptionsList = ({ emptyCTA }) => {
                   </Editable>
                 </Td>
                 <Td mr={4} p={0}>
-                  <CopyButton>{subscription.address}</CopyButton>
+                  {subscription.address?.startsWith("tag") ? (
+                    <CopyButton>{mapper[subscription.address]}</CopyButton>
+                  ) : (
+                    <CopyButton>{subscription.address}</CopyButton>
+                  )}
                 </Td>
                 <Td>
                   <ColorSelector