diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
index 30e079f76..8edfe8e0d 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
@@ -539,11 +539,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
         SpannableString span = new SpannableString(text);
         for (String s : map.keySet()) {
             int index = text.indexOf(s);
-            try {
-                span.setSpan(getClickableSpan(map.get(s)), index, index + s.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+            span.setSpan(getClickableSpan(map.get(s)), index, index + s.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
         }
         return span;
     }
@@ -551,10 +547,9 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
     private String findClicker(String text, Map<String, String> map) {
         Matcher m = Sniffer.CLICKER.matcher(text);
         while (m.find()) {
-            String val = m.group(1);
-            String key = Trans.s2t(m.group(2));
+            String key = Trans.s2t(m.group(2)).trim();
             text = text.replace(m.group(), key);
-            map.put(key, val);
+            map.put(key, m.group(1));
         }
         return text;
     }
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
index 0b7d985c2..5c155f591 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
@@ -518,11 +518,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
         SpannableString span = new SpannableString(text);
         for (String s : map.keySet()) {
             int index = text.indexOf(s);
-            try {
-                span.setSpan(getClickableSpan(map.get(s)), index, index + s.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+            span.setSpan(getClickableSpan(map.get(s)), index, index + s.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
         }
         return span;
     }
@@ -530,10 +526,9 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
     private String findClicker(String text, Map<String, String> map) {
         Matcher m = Sniffer.CLICKER.matcher(text);
         while (m.find()) {
-            String val = m.group(1);
-            String key = Trans.s2t(m.group(2));
+            String key = Trans.s2t(m.group(2)).trim();
             text = text.replace(m.group(), key);
-            map.put(key, val);
+            map.put(key, m.group(1));
         }
         return text;
     }