diff --git a/parser.py b/parser.py
index 74d44763d92d7f510e12b0d71c787292160c2756..db2ef00d494f2fecccb405cc8b3fdf09d4e9c9fd 100644
--- a/parser.py
+++ b/parser.py
@@ -158,9 +158,9 @@ class Content(Element):
     # v3: does not allow braces in the content
     #PATTERN = r"\s*(?<content>(?:[^\[\];\r\n{}]+)?(?:\[[^\]\r\n{}]+\][^;\[\]\r\n{}]*)*);?"
     # v4: do not allow empty match (require either the first or the second part to be non-empty)
-    #PATTERN = r"\s*(?<content>(?:(?:[^\[\];\r\n{}]+)|(?:[^\[\];\r\n{}]+)?(?:\[[^\]\r\n{}]+\][^;\[\]\r\n{}]*)+));?"
+    PATTERN = r"\s*(?<content>(?:(?:[^\[\];\r\n{}]+)|(?:[^\[\];\r\n{}]+)?(?:\[[^\]\r\n{}]+\][^;\[\]\r\n{}]*)+));?"
     # v5: do match emptystring if followed by a semi colon
-    PATTERN = r"\s*(?<content>(?:[^\[\];\r\n{}]+);?|(?:[^\[\];\r\n{}]+)?(?:\[[^\]\r\n{}]+\][^;\[\]\r\n{}]*)+;?|;)"
+    #PATTERN = r"\s*(?<content>(?:[^\[\];\r\n{}]+);?|(?:[^\[\];\r\n{}]+)?(?:\[[^\]\r\n{}]+\][^;\[\]\r\n{}]*)+;?|;)"
 
 class Text:
     def __init__(self, text, linenumber, fork):
@@ -271,7 +271,7 @@ class Empty(Element):
         linenumber = Element.parse_inner(match, current, linenumber)
         return current, linenumber
 
-    PATTERN = r"\s+"
+    PATTERN = r"(?:\s+|;)"
 
 class Remark(Element):
     def __init__(self, name, value, linenumber):
diff --git a/server.py b/server.py
index 8dfe5c75bfdd7f723fbbbf48839e4c1a92587f9e..58c5268a1788919246d031f6910f08977fc5ef62 100755
--- a/server.py
+++ b/server.py
@@ -114,7 +114,7 @@ def merge_todos():
 
 @manager.command
 def runserver():
-    app.run(host="192.168.0.13")
+    app.run()
     make_scheduler()
 
 # cause uwsgi currently has a bug
@@ -536,7 +536,7 @@ def upload_source_to_known_protocol(protocol):
 @login_required
 def upload_new_protocol():
     user = current_user()
-    available_types = ProtocolType.get_modifiable_protocoltypes()
+    available_types = ProtocolType.get_modifiable_protocoltypes(user)
     form = NewProtocolSourceUploadForm(protocoltypes=available_types)
     if form.validate_on_submit():
         if form.source.data is None: