diff --git a/app/src/main/java/app/fedilab/android/activities/TootActivity.java b/app/src/main/java/app/fedilab/android/activities/TootActivity.java
index 3d450ce37..2d9194df7 100644
--- a/app/src/main/java/app/fedilab/android/activities/TootActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/TootActivity.java
@@ -477,7 +477,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate,
                     if (currentCursorPosition - (searchLength - 1) < 0 || currentCursorPosition == 0 || currentCursorPosition > s.toString().length())
                         return;
 
-                    String[] searchInArray =(s.toString().substring(currentCursorPosition[ - searchLength, currentCursorPosition)).split("\\s");
+                    String[] searchInArray =(s.toString().substring(currentCursorPosition - searchLength, currentCursorPosition)).split("\\s");
                     String searchIn = searchInArray[searchInArray.length-1];
                     Matcher m, mt;
                     m = sPattern.matcher(searchIn);
diff --git a/app/src/main/java/app/fedilab/android/client/PeertubeAPI.java b/app/src/main/java/app/fedilab/android/client/PeertubeAPI.java
index 16e989143..86fad1ed5 100644
--- a/app/src/main/java/app/fedilab/android/client/PeertubeAPI.java
+++ b/app/src/main/java/app/fedilab/android/client/PeertubeAPI.java
@@ -1693,6 +1693,13 @@ public class PeertubeAPI {
      */
     public static Peertube parsePeertube(Context context, JSONObject resobj) {
         Peertube peertube = new Peertube();
+        if( resobj.has("video")){
+            try {
+                resobj = resobj.getJSONObject("video");
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+        }
         try {
             peertube.setId(resobj.get("id").toString());
             peertube.setCache(resobj);