diff --git a/app/static/js/cookies.js b/app/static/js/cookies.js
index 0e78e27d95ba20b8aab29541cb3234d3336c156e..f8816e095626e76f2234618dad9e8a307739f0b7 100644
--- a/app/static/js/cookies.js
+++ b/app/static/js/cookies.js
@@ -8,7 +8,6 @@ function setCookie(name, value) {
     expires.setTime(today.getTime() + (10*365*24*60*60*1000));
     document.cookie = name + "=" + value + ";expires=" + expires.toGMTString();
 }
-//encodeURIComponent(value)
 
 function getCookie(name) {
     /**
@@ -21,24 +20,22 @@ function getCookie(name) {
     else
         return null;
 }
-//return decodeURIComponent(RegExp["$1"]);
 
-function tab_to_str(tab) {
+function labels_tab_to_str(labels) {
     /**
-     * Transform 2D tab to string separate by semicolon.
-     * Ex : [[42, 'test', 5], [56, 'salut', 3]] =>
-     * "42, test, 5|56, salut, 3"
+     * Transform tab of labels to string.
+     * ex : [{'id_label': 1, 'name': "Learn C++", 'father_id': 6}]
+     * = 1, Learn C++, 6|...
      */
     var result = "";
-    var inter = [];
-    for (var i = 0; tab[i]; i++)
-        inter.push(tab[i]);
+    var inter = []
+    for (var i = 0; labels[i]; i++)
+        inter.push([labels[i]['id_label'], labels[i]['name'], labels[i]['father_id']]);
     result = inter.join('|');
-    console.log(result)
     return (result);
 }
 
-function str_to_tab(str) {
+function str_to_labels_tab(str) {
     /**
      * Transform string to 2D tab.
      * Ex : "42, test, 5|56, salut, 3" =>
@@ -46,8 +43,13 @@ function str_to_tab(str) {
      */
     var result = [];
     var split = str.split('|');
-    for (var i = 0; split[i]; i++)
-        result.push(split[i].split(','));
+    for (var i = 0; split[i]; i++) {
+        var inter = split[i].split(',')
+        if (inter.length == 2)
+            result.push({'id_label': inter[0], 'name': inter[1]});
+        else
+            result.push({'id_label': inter[0], 'name': inter[1], 'father_id': inter[2]});
+    }
     return (result);
 }
 
@@ -55,8 +57,8 @@ function save_session() {
     /**
      * Save old_labels_tab and unselect_tab in Cookies.
      */
-    setCookie("old_labels_tab", tab_to_str(hierarchy.old_labels_tab));
-    setCookie("unselect_labels_tab", tab_to_str(hierarchy.unselect_tab));
+    setCookie("old_labels_tab", labels_tab_to_str(hierarchy.old_labels_tab));
+    setCookie("unselect_labels_tab", labels_tab_to_str(hierarchy.unselect_tab));
     setCookie("language", hierarchy.labels_language);
 }
 
@@ -72,9 +74,9 @@ function setup_session() {
     if (getCookie('language') != null && getCookie('language').length != 0)
         hierarchy.labels_language = result.labels_language = getCookie('language');
     if (getCookie('old_labels_tab') != null && getCookie('old_labels_tab').length != 0)
-        hierarchy.old_labels_tab = str_to_tab(getCookie('old_labels_tab'));
+        hierarchy.old_labels_tab = str_to_labels_tab(getCookie('old_labels_tab'));
     if (getCookie('unselect_labels_tab') != null && getCookie('unselect_labels_tab').length != 0)
-        hierarchy.unselect_tab = str_to_tab(getCookie('unselect_labels_tab'));
+        hierarchy.unselect_tab = str_to_labels_tab(getCookie('unselect_labels_tab'));
 
     if (getCookie('old_labels_tab') != null && getCookie('old_labels_tab').length != 0) {
         hierarchy.init_all_labels();
diff --git a/app/templates/browse.html b/app/templates/browse.html
index ed1666599e4340a3298422c5a24b9d95a650168f..06a5e67386b53993e80a0ee93a507430391ac38a 100644
--- a/app/templates/browse.html
+++ b/app/templates/browse.html
@@ -148,12 +148,12 @@
 			 * Initialise the two different par of hierarcy and
 			 * the array that contain all tutos.
 			 */
-			// setup = setup_session();
-			// if (setup == 0) {
+			setup = setup_session();
+			if (setup == 0) {
 				hierarchy.init_all_labels();
 				hierarchy.init_new_labels_tab();
 				result.init_result_tab();
-			// }
+			}
 		}
 
 		function update_loading(value) {