diff --git a/app/templates/_video_item.html b/app/templates/_video_item.html
index a24b977..d48ef07 100644
--- a/app/templates/_video_item.html
+++ b/app/templates/_video_item.html
@@ -1,6 +1,6 @@
 <div class="card">
     <div class="image">
-        <img alt="Thumbnail" src="/img/{{video.videoThumb}}">
+        <img alt="Thumbnail" src="/img/{{video.videoThumb.replace('/', '~')}}">
     </div>
     <div class="content">
         <a class="video-title break-word" href="{{url_for('watch', v=video.id, _method='GET')}}">{{video.videoTitle}}</a>
diff --git a/app/templates/channel.html b/app/templates/channel.html
index 171880f..a4f3c5b 100644
--- a/app/templates/channel.html
+++ b/app/templates/channel.html
@@ -4,7 +4,7 @@
     <div class="blue ui centered card">
         <div class="content">
             <div class="center aligned author">
-                <img alt="Avatar" class="ui avatar image" src="{{channel.avatar}}">
+                <img alt="Avatar" class="ui avatar image" src="/img/{{channel.avatar.replace('/', '~')}}">
             </div>
             <div class="center aligned header"><a href="">{{channel.name}}</a></div>
             <div class="center aligned description">
diff --git a/app/templates/ytsearch.html b/app/templates/ytsearch.html
index 8af14a0..a7f7e23 100644
--- a/app/templates/ytsearch.html
+++ b/app/templates/ytsearch.html
@@ -58,8 +58,6 @@
                             {% include '_video_item.html' %}
                         {% endfor %}
                     </div>
-                {% else %}
-                    {% include '_empty_feed.html' %}
                 {% endif %}
             </div>
 </div>