diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index a977ae57fbc..4c52182cff7 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -45,10 +45,10 @@ function printDropdownBookmarksList()
 		$tmpurl = '';
 		// No urlencode, all param $url will be urlencoded later
 		if ($sortfield) {
-			$tmpurl .= ($tmpurl ? '&' : '').'sortfield='.$sortfield;
+			$tmpurl .= ($tmpurl ? '&' : '').'sortfield='.urlencode($sortfield);
 		}
 		if ($sortorder) {
-			$tmpurl .= ($tmpurl ? '&' : '').'sortorder='.$sortorder;
+			$tmpurl .= ($tmpurl ? '&' : '').'sortorder='.urlencode($sortorder);
 		}
 		if (is_array($_POST)) {
 			foreach ($_POST as $key => $val) {
diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index 83eb9ce68b9..021bffe40b4 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -295,8 +295,6 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON l.fk_product = p.rowid";
 	if ($selected_cat === -2) {	// Without any category
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product";
-	} elseif ($selected_cat) { 	// Into a specific category
-		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_product as cp";
 	}
 
 	$parameters = array();