diff --git a/ChangeLog b/ChangeLog
index 4871c8ce58b5c4bd53f40576a2884759486b6ac4..1670165d40c557aa7f0f1c37f2cc622816eeaf4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -146,6 +146,8 @@ Fix: Missing include files.lib.php in some pages that use dol_delete_recursive
 Fix: [ bug #1558 ] Product/service edit page title shows new Ref instead of old ref.
 Fix: [ bug #1553 ] Saving User displays setup removes menu.
 Fix: [ bug #1544 ] Can remove date from invoice
+Fix: list event view lost type event filter
+Fix: Add code save on create event
 
 ***** ChangeLog for 3.5.4 compared to 3.5.3 *****
 Fix: Hide title of event when agenda module disabled.
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index c4de7377ebddab82ef26b39d5400863e18ac4b05..2044c511c35a7a28565cf5849f9014acb12f8cf9 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -74,7 +74,7 @@ class Categorie extends CommonObject
 	function fetch($id,$label='')
 	{
 		global $conf;
-		
+
 		// Check parameters
 		if (empty($id) && empty($label)) return -1;
 
@@ -1137,11 +1137,11 @@ class Categorie extends CommonObject
 		$cats = array();
 
 		$typeid=-1; $table='';;
-		if ($type == '0' || $type == 'product')	     { $typeid=0; $table='product';   $type='product'; }
+		if ($type == '0' || $type == 'product')	       { $typeid=0; $table='product';   $type='product'; }
 		else if ($type == '1' || $type == 'supplier') { $typeid=1; $table='societe';   $type='fournisseur'; }
 		else if ($type == '2' || $type == 'customer') { $typeid=2; $table='societe';   $type='societe'; }
 		else if ($type == '3' || $type == 'member')   { $typeid=3; $table='member';    $type='member'; }
-        else if ($type == '4' || $type == 'contact')	 { $typeid=4; $table='socpeople'; $type='contact'; }
+        else if ($type == '4' || $type == 'contact')  { $typeid=4; $table='socpeople'; $type='contact'; }
 
 		$sql = "SELECT ct.fk_categorie, c.label";
 		$sql.= " FROM ".MAIN_DB_PREFIX."categorie_".$type." as ct, ".MAIN_DB_PREFIX."categorie as c";