diff --git a/themes/modern/src/modern-html.html b/themes/modern/src/modern-html.html
index 5a6a62b..d9e6e35 100644
--- a/themes/modern/src/modern-html.html
+++ b/themes/modern/src/modern-html.html
@@ -73,7 +73,7 @@
   <span class="fa fa-lg fa-building"></span>
   {{#each r.employment.history}}
     {{#if url}}
-    <h4><span class="res-label">{{ position }}</span>, <a href="{{ url }}">{{ employer }}</a></h4>
+    <h4><span class="res-label">{{ position }}</span>, <a href="{{{ url }}}">{{ employer }}</a></h4>
     {{else}}
     <h4><span class="res-label">{{ position }}</span>, <span class="defunct">{{ employer }}</span></h4>
     {{/if}}
@@ -82,7 +82,7 @@
     {{#if proj.highlights}}
       <ul>
       {{#each highlights}}
-        <li>{{ this }}</li>
+        <li>{{{ this }}}</li>
       {{/each}}
       </ul>
     {{/if}}
@@ -104,7 +104,7 @@
     {{#if courses}}
       <ul>
       {{#each courses}}
-        <li>{{ this }}</li>
+        <li>{{{ this }}}</li>
       {{/each}}
       </ul>
     {{/if}}
@@ -131,7 +131,7 @@
     {{#if highlights}}
       <ul>
       {{#each highlights}}
-        <li>{{ this }}</li>
+        <li>{{{ this }}}</li>
       {{/each}}
       </ul>
     {{/if}}
diff --git a/themes/modern/src/modern-pdf.html b/themes/modern/src/modern-pdf.html
index 3a062b1..7649ab9 100644
--- a/themes/modern/src/modern-pdf.html
+++ b/themes/modern/src/modern-pdf.html
@@ -23,7 +23,6 @@
           {{#if r.contact.website}}<div class="website"><a href="{{{ RAW.contact.website }}}">{{ RAW.contact.website }}</a></div>{{/if}}
         </div>
       </header>
-      </header>
 
 
 {{#if r.info.brief}}
@@ -79,7 +78,7 @@
   <span class="fa fa-lg fa-building"></span>
   {{#each r.employment.history}}
     {{#if url}}
-    <h4><span class="res-label">{{ position }}</span>, <a href="{{ url }}">{{ employer }}</a></h4>
+    <h4><span class="res-label">{{ position }}</span>, <a href="{{{ url }}}">{{ employer }}</a></h4>
     {{else}}
     <h4><span class="res-label">{{ position }}</span>, <span class="defunct">{{ employer }}</span></h4>
     {{/if}}
@@ -88,7 +87,7 @@
     {{#if proj.highlights}}
       <ul>
       {{#each highlights}}
-        <li>{{ this }}</li>
+        <li>{{{ this }}}</li>
       {{/each}}
       </ul>
     {{/if}}
@@ -110,7 +109,7 @@
     {{#if courses}}
       <ul>
       {{#each courses}}
-        <li>{{ this }}</li>
+        <li>{{{ this }}}</li>
       {{/each}}
       </ul>
     {{/if}}
@@ -137,7 +136,7 @@
     {{#if highlights}}
       <ul>
       {{#each highlights}}
-        <li>{{ this }}</li>
+        <li>{{{ this }}}</li>
       {{/each}}
       </ul>
     {{/if}}