diff --git a/templates/index.html b/templates/index.html
index f54a91690f27a12257da7b2e51573561a01e59bc..f2100078abefaf535134dd61cd32c80dde9781c6 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -18,7 +18,7 @@
 				<li class="pull-right">{{ valuedeletebtn(('announcements',msg.id,'deleted')) }}</li>
 				<li class="pull-right" style="padding-right: 5px;">
 					{% if not msg.visible %}
-						<a href="{{ url_for('edit', ref=request.url) }}&announcements.{{ msg.id }}.visible=1" class="btn btn-primary">Veröffentlichen</a>
+						<a href="{{ url_for('edit', prefix='announcements.'+str(msg.id|string)+'.', ref=request.url, visible=1) }}" class="btn btn-primary">Veröffentlichen</a>
 					{% elif msg.time_expire and msg.time_expire < datetime.now() %}
 						<a href="#" class="btn btn-danger disabled">Abgelaufen</a>
 					{% elif msg.time_publish and msg.time_publish > datetime.now() %}
@@ -31,7 +31,7 @@
 					<span class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown">{{levels.get(msg.level, ('', 'Unbekannt'))[1]}} <span class="caret"></span></span>
 					<ul class="dropdown-menu">
 						{% for level, descr in levels.items() %}
-							<li><a href="{{ url_for('edit', ref=request.url) }}&announcements.{{ msg.id }}.level={{ level }}">{{ descr[1] }}</a></li>
+							<li><a href="{{ url_for('edit', prefix='announcements.'+(msg.id|string)+'.', ref=request.url, level=level) }}">{{ descr[1] }}</a></li>
 						{% endfor %}
 					</ul>
 				</li>