diff --git a/app/routes.py b/app/routes.py
index b2612be..39b91c8 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -649,7 +649,7 @@ def getFeed(urls):
                         newPost.twitterName = post.find('a', attrs={'class':'fullname'}).text
                         newPost.timeStamp = datetime.datetime.strptime(date_time_str, '%d/%m/%Y %H:%M:%S')
                         newPost.date = post.find('span', attrs={'class':'tweet-date'}).find('a').text
-                        newPost.content = markupString(Markup(post.find('div',  attrs={'class':'tweet-content'})))
+                        newPost.content = Markup(post.find('div',  attrs={'class':'tweet-content'}))
                         
                         if post.find('div', attrs={'class':'retweet-header'}):
                             newPost.username = post.find('div', attrs={'class':'retweet-header'}).find('div', attrs={'class':'icon-container'}).text
diff --git a/app/templates/settings.html b/app/templates/settings.html
index 64f38ca..f744467 100644
--- a/app/templates/settings.html
+++ b/app/templates/settings.html
@@ -89,7 +89,7 @@
                 <p><b>Active users:</b> {{info.active}}</p>
             </div>
             <div class="ui segment">
-                <p><b>Server location:</b> {{config.location}}</p>
+                <p><b>Server location:</b> {{config.serverLocation}}</p>
             </div>
             <div class="ui segment">
                 <p><a href="https://github.com/pluja/Yotter#donate">Consider making a donation</a></p>