diff --git a/posts.py b/posts.py
index c834c2d4c..6c22f1ca5 100644
--- a/posts.py
+++ b/posts.py
@@ -217,6 +217,10 @@ def getPersonBox(baseDir: str, session, wfRequest: {},
     asHeader = {
         'Accept': 'application/activity+json; profile="' + profileStr + '"'
     }
+    if not wfRequest:
+        print('No webfinger given')
+        return None, None, None, None, None, None, None
+
     if not wfRequest.get('errors'):
         personUrl = getUserUrl(wfRequest, sourceId)
     else:
diff --git a/webapp_media.py b/webapp_media.py
index 0156b65da..ff6b07d24 100644
--- a/webapp_media.py
+++ b/webapp_media.py
@@ -53,6 +53,8 @@ def _addEmbeddedVideoFromSites(translate: {}, content: str,
             url = url.split('"')[0].replace('/watch?v=', '/embed/')
             if '&' in url:
                 url = url.split('&')[0]
+            if '?utm_' in url:
+                url = url.split('?utm_')[0]
             content = \
                 content + "<center>\n<iframe loading=\"lazy\" src=\"" + \
                 videoSite + url + "\" width=\"" + str(width) + \
@@ -80,6 +82,8 @@ def _addEmbeddedVideoFromSites(translate: {}, content: str,
                 url = url.split('"')[0].replace('/watch?v=', '/embed/')
                 if '&' in url:
                     url = url.split('&')[0]
+                if '?utm_' in url:
+                    url = url.split('?utm_')[0]
                 content = \
                     content + "<center>\n<iframe loading=\"lazy\" src=\"" + \
                     videoSite + url + "\" width=\"" + \