diff --git a/src/General/lib/fetcher.class b/src/General/lib/fetcher.class
index 891ae1959..49baf9257 100644
--- a/src/General/lib/fetcher.class
+++ b/src/General/lib/fetcher.class
@@ -119,12 +119,8 @@ class Fetcher
         greentext = text[0] is '>'
         text = text.replace /(\[\/?[a-z]+):lit(\])/, '$1$2'
         text = for text2, j in text.split /(>>(?:>\/[a-z\d]+\/)?\d+)/g
-          if j % 2 is 1
-            <%= html('<span class="deadlink">${text2}</span>') %>
-          else
-            <%= html('${text2}') %>
-        text = <%= html('@{text}') %>
-        text = <%= html('<span class="quote">&{text}</span>') %> if greentext
+          <%= html('?{j % 2}{<span class="deadlink">${text2}</span>}{${text2}}') %>
+        text = <%= html('?{greentext}{<span class="quote">@{text}</span>}{@{text}}') %>
         text
     comment = <%= html('@{comment}') %>
 
diff --git a/src/Miscellaneous/FileInfo.coffee b/src/Miscellaneous/FileInfo.coffee
index 3b077f001..74ea41f97 100755
--- a/src/Miscellaneous/FileInfo.coffee
+++ b/src/Miscellaneous/FileInfo.coffee
@@ -40,7 +40,7 @@ FileInfo =
       else
         <%= html('<span class="fnswitch"><span class="fntrunc">${shortname}</span><span class="fnfull">${fullname}</span></span>') %>
     N: -> <%= html('${this.file.name}') %>
-    p: -> if @file.isSpoiler then <%= html('Spoiler, ') %> else <%= html('') %>
+    p: -> <%= html('?{this.file.isSpoiler}{Spoiler, }') %>
     s: -> <%= html('${this.file.size}') %>
     B: -> <%= html('${Math.round(this.file.sizeInBytes)} Bytes') %>
     K: -> <%= html('${Math.round(this.file.sizeInBytes/1024)} KB') %>