diff --git a/js/full_tags.php b/js/full_tags.php
new file mode 100644
index 00000000..5bba4f89
--- /dev/null
+++ b/js/full_tags.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright (c) 2013 Lukas Reschke <lukas@statuscode.ch>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+// Set the content type to Javascript
+header("Content-type: text/javascript");
+
+// Disallow caching
+header("Cache-Control: no-cache, must-revalidate"); 
+header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); 
+
+$qtags = OC_Bookmarks_Bookmarks::findTags(array(), 0, 400);
+$tags = array();
+foreach($qtags as $tag) {
+	$tags[] = $tag['tag'];
+}
+
+?>
+var fullTags = <?php echo json_encode($tags);?>;
+$(document).ready(function() {
+	$('body').bookmark_dialog({
+	'on_success': function(){
+		self.close(); 
+	}
+	});
+});
\ No newline at end of file
diff --git a/templates/addBm.php b/templates/addBm.php
index 6457c551..987b1bc7 100644
--- a/templates/addBm.php
+++ b/templates/addBm.php
@@ -1,13 +1,7 @@
 <form class="addBm" method="post" action="<?php echo OCP\Util::linkTo('bookmarks', 'ajax/editBookmark.php');?>">
 		<?php if(!isset($embedded) || !$embedded):?>
-			<script type="text/javascript">
-				var fullTags = <?php echo $_['tags'];?>;
-				$(document).ready(function() {
-					$('body').bookmark_dialog({
-						'on_success': function(){	self.close(); }
-					});
-				});
-			</script>
+			<script type="text/javascript" src="<?php echo OC_Helper::linkTo('bookmarks/js', 'full_tags.php');?>"></script>
+
 			<h1><?php echo $l->t('Add a bookmark');?></h1>
 			<div class="close_btn">
 				<a href="javascript:self.close()" class="ui-icon ui-icon-closethick">
diff --git a/templates/list.php b/templates/list.php
index 2c2d79e4..92f6f995 100644
--- a/templates/list.php
+++ b/templates/list.php
@@ -59,9 +59,8 @@ function bookmarklet(){
 	</div>
 	<div class="bookmarks_list"></div>
 </div>
-<script>
-	var fullTags = <?php echo $_['tags'];?>;
-</script>
+<script type="text/javascript" src="<?php echo OC_Helper::linkTo('bookmarks/js', 'full_tags.php');?>"></script>
+
 
 <script type="text/html" id="edit_dialog_tmpl">
 <?php require 'addBm.php';?>