diff --git a/MVMCoreUI/Atoms/Views/Label.swift b/MVMCoreUI/Atoms/Views/Label.swift
index 1b1d622e..b46f8ac7 100644
--- a/MVMCoreUI/Atoms/Views/Label.swift
+++ b/MVMCoreUI/Atoms/Views/Label.swift
@@ -47,7 +47,7 @@ public typealias ActionBlock = () -> Void
     public struct ActionableClause {
         var range: NSRange?
         var actionBlock: ActionBlock?
-        var text: String?
+//        var text: String?
         var hash: Int = 0
         
         func performAction() {
@@ -261,10 +261,7 @@ public typealias ActionBlock = () -> Void
                     actionLabel.addActionAttributes(range: range, string: attributedString)
                     let accessibleAction = actionLabel.customAccessibilityAction(range: range)
                     let actionBlock = actionLabel.createActionBlockFrom(actionMap: json, additionalData: additionalData, delegateObject: delegate)
-                    let actionableClause = ActionableClause(range: range,
-                                                            actionBlock: actionBlock,
-                                                            text: accessibleAction?.name ?? "",
-                                                            hash: accessibleAction?.hash ?? -1)
+                    let actionableClause = ActionableClause(range: range, actionBlock: actionBlock, hash: accessibleAction?.hash ?? -1)
                     actionLabel.clauses.append(actionableClause)
 
                 default:
@@ -491,9 +488,8 @@ extension Label {
     @objc public func addTappableLinkAttribute(range: NSRange, actionBlock: @escaping ActionBlock) {
         
         setActionAttributes(range: range)
-        let actionText = NSString(string: text!).substring(with: range)
         let accessibleAction = customAccessibilityAction(range: range)
-        clauses.append(ActionableClause(range: range, actionBlock: actionBlock, text: actionText, hash: accessibleAction!.hash))
+        clauses.append(ActionableClause(range: range, actionBlock: actionBlock, hash: accessibleAction?.hash ?? -1))
     }
     
     /**
@@ -509,10 +505,9 @@ extension Label {
     @objc public func addTappableLinkAttribute(range: NSRange, actionMap: [AnyHashable: Any]?, additionalData: [AnyHashable: Any]?, delegateObject: DelegateObject?) {
         
         setActionAttributes(range: range)
-        let actionText = NSString(string: text!).substring(with: range)
         let accessibleAction = customAccessibilityAction(range: range)
         let actionBlock = createActionBlockFrom(actionMap: actionMap, additionalData: additionalData, delegateObject: delegateObject)
-        clauses.append(ActionableClause(range: range, actionBlock: actionBlock, text: actionText, hash: accessibleAction!.hash))
+        clauses.append(ActionableClause(range: range, actionBlock: actionBlock, hash: accessibleAction?.hash ?? -1))
     }
     
     @objc private func textLinkTapped(_ gesture: UITapGestureRecognizer) {
diff --git a/MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift b/MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift
index c8a83862..39b996a2 100644
--- a/MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift
+++ b/MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift
@@ -67,8 +67,12 @@ public typealias CoreObjectActionLoadPresentDelegate = MVMCoreActionDelegateProt
                 guard let label = label else { return }
                 
                 let accessibleAction = UIAccessibilityCustomAction(name: actionText ?? "", target: label, selector: #selector(label.accessibilityCustomAction(_:)))
-                label.clauses = [Label.ActionableClause(range: actionRange, actionBlock: newActionBlock, text: actionText ?? "", hash: accessibleAction.hash)]
+                label.clauses = [Label.ActionableClause(range: actionRange, actionBlock: newActionBlock, hash: accessibleAction.hash)]
                 label.accessibilityCustomActions = [accessibleAction]
+                
+                if label.accessibilityHint == nil {
+                    label.accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: "plan_selector_int_swipe_action_hint")
+                }
             }
         }
     }