diff --git a/app/Http/Controllers/TagviewController.php b/app/Http/Controllers/TagviewController.php
index 81e9004..e23b486 100644
--- a/app/Http/Controllers/TagviewController.php
+++ b/app/Http/Controllers/TagviewController.php
@@ -55,6 +55,7 @@ class TagviewController extends Controller
             // Don't filter on specific video.
             // TODO: Add warning page
             $video = Video::withAllTags($tags)->find($id);
+           
         }
 
         if (is_null($video)) {
diff --git a/resources/views/layout2/video-partials/legacy-videonav.blade.php b/resources/views/layout2/video-partials/legacy-videonav.blade.php
index c4bb002..1c661b9 100644
--- a/resources/views/layout2/video-partials/legacy-videonav.blade.php
+++ b/resources/views/layout2/video-partials/legacy-videonav.blade.php
@@ -1,19 +1,19 @@
 <div class="row videonavigation">
 @if($related)
-					@if(($prev = $video->getPrev($related)) === null)
+					@if(($prev = $video->getPrev($related, $isTag)) === null)
 						<div class="col- first-video"><a class="first" href="#" style="visibility: hidden;"><i class="fa  fa-arrow-left"></i> first</a></div>
 						<div class="col video-navigation"><a id="prev" href="#" style="visibility: hidden;"><i class="fa  fa-arrow-left"></i> prev</a> |
 					@else
-						<div class="col- first-video"><a class="first" href="{{url($related->baseurl(), $video->getFirstId($related))}}"><i class="fa  fa-arrow-left"></i> first</a></div>
-						<div class="col video-navigation"><a id="prev" href="{{url($related->baseurl(), [$prev->id])}}"><i class="fa  fa-arrow-left"></i> prev</a> |
+						<div class="col- first-video"><a class="first" href="{{url($isTag ? '/t/' . $related : $related->baseurl(), $video->getFirstId($related,$isTag))}}"><i class="fa  fa-arrow-left"></i> first</a></div>
+						<div class="col video-navigation"><a id="prev" href="{{url($isTag ? '/t/' . $related : $related->baseurl(), [$prev->id])}}"><i class="fa  fa-arrow-left"></i> prev</a> |
 					@endif
-					<a href="{{url($related->baseurl())}}">{!!$related->displayName()!!}</a>
-					@if(($next = $video->getNext($related)) === null)
+					<a href="{{url($isTag ? '/t/' . $related : $related->baseurl())}}">{!!$isTag ? $related:$related->displayName()!!}</a>
+					@if(($next = $video->getNext($related,$isTag)) === null)
 						| <a id="next" href="#" style="visibility: hidden;">next <i class="fa  fa-arrow-right"></i></a></div>
 						<div class="col- latest-video"><a class="last" href="#" style="visibility: hidden;">last <i class="fa  fa-arrow-right"></i></a></div>
 					@else
-						| <a id="next" href="{{url($related->baseurl(), [$next->id])}}">next <i class="fa  fa-arrow-right"></i></a></div>
-						<div class="col- latest-video"><a class="last" href="{{url($related->baseurl(), $video->getLastId($related))}}">last <i class="fa  fa-arrow-right"></i></a></div>
+						| <a id="next" href="{{url($isTag ? '/t/' . $related : $related->baseurl(), [$next->id])}}">next <i class="fa  fa-arrow-right"></i></a></div>
+						<div class="col- latest-video"><a class="last" href="{{url($isTag ? '/t/' . $related : $related->baseurl(), $video->getLastId($related,$isTag))}}">last <i class="fa  fa-arrow-right"></i></a></div>
 					@endif
 				@else
 					@if(($prev = $video->getPrev()) === null)
diff --git a/resources/views/layout2/video.blade.php b/resources/views/layout2/video.blade.php
index 0ea0906..0e0c588 100644
--- a/resources/views/layout2/video.blade.php
+++ b/resources/views/layout2/video.blade.php
@@ -5,7 +5,7 @@
     	<div class="video">
     		<div class="embed-responsive embed-responsive-16by9">
 				<video id="video" class="video embed-responsive-item" loop preload="auto" crossorigin="anonymous">
-					<source src="//w0bm.com/b{{ "/" . $video->file }}">
+					<source src="/b{{ "/" . $video->file }}">
 				</video>
 			</div>
     	</div>
@@ -19,7 +19,7 @@
     	<div class="video-wrap embed-responsive embed-responsive-16by9">
     		<div class="video">
 				<video id="video" class="video embed-responsive-item" loop preload="auto" crossorigin="anonymous">
-					<source src="//w0bm.com/b{{ "/" . $video->file }}">
+					<source src="/b{{ "/" . $video->file }}">
 				</video>
 			</div>
     	</div>
@@ -40,7 +40,7 @@
                 <iframe style="height:100%!important; min-height: auto!important;" src="https://w0bm.com/loop/index.html"></iframe>
             @else
             <video class="video scrollable" loop id="video" controls>
-                <source src="//w0bm.com/b{{ "/" . $video->file }}">
+                <source src="/b{{ "/" . $video->file }}">
             </video>
             @endif
         </div>