diff --git a/addBm.php b/addBm.php
index 3412e9ac..6aed6349 100644
--- a/addBm.php
+++ b/addBm.php
@@ -27,28 +27,33 @@
 OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('bookmarks');
 
+
+require_once('bookmarksHelper.php');
+
+
+
 if(!isset($_GET['url']) || trim($_GET['url']) == '') {
 	header("HTTP/1.0 404 Not Found");
 	$tmpl = new OCP\Template( '', '404', 'guest' );
 	$tmpl->printPage();
 	exit;
+}elseif(isset($_POST['url'])) {
+	$bm = addBookmark($_POST['url'], $_POST['title'], implode(' ',$_POST['item']['tags']),$_POST['desc'], $_POST['is_public']);
+	OCP\JSON::success(array('id'=>$bm));
+	exit();
 }
 	
-require_once('bookmarksHelper.php');
-
-if(isset($_POST['url'])) {
-	addBookmark($_POST['url'], '', 'Read-Later');
-}
-
 OCP\Util::addscript('bookmarks','tag-it');
 OCP\Util::addscript('bookmarks','addBm');
 OCP\Util::addStyle('bookmarks', 'bookmarks');
 OCP\Util::addStyle('bookmarks', 'jquery.tagit');
 
-$bm = array('title'=>'hello world',
+$datas = getURLMetadata($_GET['url']);
+
+$bm = array('title'=> $datas['title'] ? $datas['title'] : '' ,
 	'url'=> $_GET['url'],
-	'tags'=> array('@admin','music','test'),
-	'desc'=>'A fancy description',
+	'tags'=> array(),
+	'desc'=>'',
 	'is_public'=>1,
 );
 
diff --git a/bookmarksHelper.php b/bookmarksHelper.php
index 988042fc..c596fe84 100644
--- a/bookmarksHelper.php
+++ b/bookmarksHelper.php
@@ -55,7 +55,6 @@ function getURLMetadata($url) {
 		$url = 'http://' . $url;
 	} 
 	$metadata['url'] = $url;
-
 	if (!function_exists('curl_init')){
 		return $metadata;
 	}
diff --git a/js/addBm.js b/js/addBm.js
index 006a8aa0..fe6b06fb 100644
--- a/js/addBm.js
+++ b/js/addBm.js
@@ -5,9 +5,7 @@ $(document).ready(function() {
 	$('#addBm').submit(bookletSubmit);
 	$('#tags').tagit({
 		allowSpaces: true,
-		availableTags: sampleTags,
-		itemName: 'item',
-		fieldName: 'tags',
+		availableTags: sampleTags
 	});
 });
 
@@ -36,7 +34,9 @@ function bookletSubmit(event) {
 		url: $('#addBm').attr('action'),
 		data: $('#addBm').serialize(),
 		success: function(data){ 
-			self.close();
+			if(data.status == 'success'){
+				self.close();
+			}
 		}
 	});
 }
\ No newline at end of file