diff --git a/apiserver/feed.py b/apiserver/feed.py
index 34c7c18..55a1f2d 100644
--- a/apiserver/feed.py
+++ b/apiserver/feed.py
@@ -89,7 +89,7 @@ def get_first_image(text):
     except:
         return ''
 
-def update_story(story):
+def update_story(story, manual=False):
     res = {}
 
     logging.info('Updating story ' + str(story['ref']))
@@ -109,7 +109,7 @@ def update_story(story):
         logging.info('Article not ready yet')
         return False
 
-    if story['date'] and story['date'] + TWO_DAYS < time.time():
+    if story['date'] and not manual and story['date'] + TWO_DAYS < time.time():
         logging.info('Article too old, removing')
         return False
 
diff --git a/apiserver/server.py b/apiserver/server.py
index ad31fdf..f471391 100644
--- a/apiserver/server.py
+++ b/apiserver/server.py
@@ -7,7 +7,7 @@ import copy
 import threading
 import time
 import shelve
-from urllib.parse import urlparse
+from urllib.parse import urlparse, parse_qs
 
 import archive
 import feed
@@ -93,18 +93,39 @@ def search():
 
 @flask_app.route('/api/submit', methods=['POST'], strict_slashes=False)
 def submit():
-    url = request.form['url']
-    nid = new_id()
-    news_story = dict(id=nid, ref=url, source='manual')
-    news_cache[nid] = news_story
-    valid = feed.update_story(news_story)
-    if valid:
-        archive.update(news_story)
-        return {'nid': nid}
-    else:
-        news_cache.pop(nid, '')
+    try:
+        url = request.form['url']
+        nid = new_id()
+
+        parse = urlparse(url)
+        if 'news.ycombinator.com' in parse.hostname:
+            source = 'hackernews'
+            ref = parse_qs(parse.query)['id'][0]
+        elif 'tildes.net' in parse.hostname and '~' in url:
+            source = 'tildes'
+            ref = parse.path.split('/')[2]
+        elif 'reddit.com' in parse.hostname and 'comments' in url:
+            source = 'reddit'
+            ref = parse.path.split('/')[4]
+        else:
+            source = 'manual'
+            ref = url
+
+        news_story = dict(id=nid, ref=ref, source=source)
+        news_cache[nid] = news_story
+        valid = feed.update_story(news_story, manual=True)
+        if valid:
+            archive.update(news_story)
+            return {'nid': nid}
+        else:
+            news_cache.pop(nid, '')
+            raise Exception('Invalid article')
+
+    except BaseException as e:
+        logging.error('Problem with article submission: {} - {}'.format(e.__class__.__name__, str(e)))
         abort(400)
 
+
 @flask_app.route('/api/<sid>')
 def story(sid):
     story = get_story(sid)
diff --git a/apiserver/utils.py b/apiserver/utils.py
index 5b3cc38..6546187 100644
--- a/apiserver/utils.py
+++ b/apiserver/utils.py
@@ -39,6 +39,8 @@ ALLOWED_TAGS = [
         'sub',
         'details',
         'summary',
+        'br',
+        'pre',
         ]
 
 clean = Cleaner(tags=ALLOWED_TAGS).clean