diff --git a/addBm.php b/addBm.php
index bc039c4d..50922acf 100644
--- a/addBm.php
+++ b/addBm.php
@@ -40,7 +40,7 @@ if(!isset($_GET['url']) || trim($_GET['url']) == '') {
 }elseif(isset($_POST['url'])) {
 	$tags = isset($_POST['item']['tags']) ? $_POST['item']['tags'] : array();
 	$pub = isset($_POST['is_public']) ? true : false;
-	$bm = addBookmark($_POST['url'], $_POST['title'], implode(' ',$tags),$_POST['desc'], $pub);
+	$bm = addBookmark($_POST['url'], $_POST['title'], implode(',',$tags),$_POST['desc'], $pub);
 	OCP\JSON::success(array('id'=>$bm));
 	exit();
 }
diff --git a/bookmarksHelper.php b/bookmarksHelper.php
index e3b8df2a..f4038e38 100644
--- a/bookmarksHelper.php
+++ b/bookmarksHelper.php
@@ -106,7 +106,7 @@ function addBookmark($url, $title, $tags='', $description='', $is_public=false)
 			VALUES (?, ?)
 			");
 
-		$tags = explode(' ', urldecode($tags));
+		$tags = explode(',', urldecode($tags));
 		foreach ($tags as $tag) {
 			if(empty($tag)) {
 				//avoid saving blankspaces