diff --git a/view/templates/photo_view.tpl b/view/templates/photo_view.tpl
index d5c3d6826..4f5be40fc 100644
--- a/view/templates/photo_view.tpl
+++ b/view/templates/photo_view.tpl
@@ -22,17 +22,17 @@
 {{/if}}
 {{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
 
-{{if $edit}}{{$edit}}{{/if}}
+{{if $edit}}{{$edit nofilter}}{{/if}}
 
 {{if $likebuttons}}
 <div id="photo-like-div">
-	{{$likebuttons}}
-	{{$like}}
-	{{$dislike}}	
+	{{$likebuttons nofilter}}
+	{{$like nofilter}}
+	{{$dislike nofilter}}
 </div>
 {{/if}}
 
-{{$comments}}
+{{$comments nofilter}}
 
 {{$paginate nofilter}}
 
diff --git a/view/theme/frio/templates/photo_view.tpl b/view/theme/frio/templates/photo_view.tpl
index 1d39b16ee..359c42669 100644
--- a/view/theme/frio/templates/photo_view.tpl
+++ b/view/theme/frio/templates/photo_view.tpl
@@ -68,13 +68,13 @@
 		{{/if}}
 
 		{{* The part for editing the photo - only available for the edit subpage *}}
-		{{if $edit}}{{$edit}}{{/if}}
+		{{if $edit}}{{$edit nofilter}}{{/if}}
 
 		{{if $likebuttons}}
 		<div id="photo-like-div">
-			{{$likebuttons}}
-			{{$like}}
-			{{$dislike}}
+			{{$likebuttons nofilter}}
+			{{$like nofilter}}
+			{{$dislike nofilter}}
 		</div>
 		{{/if}}
 		<hr>
@@ -82,7 +82,7 @@
 
 	{{* Insert the comments *}}
 	<div id="photo-comment-wrapper-{{$id}}" class="photo-comment-wrapper">
-		{{$comments}}
+		{{$comments nofilter}}
 	</div>
 
 	{{$paginate nofilter}}
diff --git a/view/theme/quattro/templates/photo_view.tpl b/view/theme/quattro/templates/photo_view.tpl
index cd1a7ccc9..0b65c2c53 100644
--- a/view/theme/quattro/templates/photo_view.tpl
+++ b/view/theme/quattro/templates/photo_view.tpl
@@ -20,18 +20,18 @@
 {{/if}}
 {{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
 
-{{if $edit}}{{$edit}}{{/if}}
+{{if $edit}}{{$edit nofilter}}{{/if}}
 
 {{if $likebuttons}}
 <div id="photo-like-div">
-	{{$likebuttons}}
-	{{$like}}
-	{{$dislike}}	
+	{{$likebuttons nofilter}}
+	{{$like nofilter}}
+	{{$dislike nofilter}}
 </div>
 {{/if}}
 
 <div class="wall-item-comment-wrapper photo">
-    {{$comments}}
+    {{$comments nofilter}}
 </div>
 
 {{$paginate nofilter}}
diff --git a/view/theme/vier/templates/photo_view.tpl b/view/theme/vier/templates/photo_view.tpl
index 21eda89b3..aa3f7aadd 100644
--- a/view/theme/vier/templates/photo_view.tpl
+++ b/view/theme/vier/templates/photo_view.tpl
@@ -22,18 +22,18 @@
 {{/if}}
 {{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}}
 
-{{if $edit}}{{$edit}}{{/if}}
+{{if $edit}}{{$edit nofilter}}{{/if}}
 
 {{if $likebuttons}}
 <div id="photo-like-div">
-	{{$likebuttons}}
-	{{$like}}
-	{{$dislike}}	
+	{{$likebuttons nofilter}}
+	{{$like nofilter}}
+	{{$dislike nofilter}}
 </div>
 {{/if}}
 
 <div class="wall-item-comment-wrapper photo">
-{{$comments}}
+	{{$comments nofilter}}
 </div>
 
 {{$paginate nofilter}}