diff --git a/modules/Home/models/Module.php b/modules/Home/models/Module.php
index de3b0ec5340956133add3d276955dbf3e24e9ced..2bea4aa117b1c703f219dbf3bc019341347d4c2e 100644
--- a/modules/Home/models/Module.php
+++ b/modules/Home/models/Module.php
@@ -84,7 +84,9 @@ class Home_Module_Model extends Vtiger_Module_Model {
 	 * @param <String> $type - comments, updates or all
 	 * @return <Array>
 	 */
-	public function getHistory($pagingModel, $type='all', $userId='all', $dateFilter='') {
+	public function getHistory($pagingModel, $type='', $userId='', $dateFilter='') {
+		if(!$userId)	$userId	= 'all';
+		if(!$type)		$type	= 'all';
 		//TODO: need to handle security
 		$comments = array();
 		if($type == 'all' || $type == 'comments') {
diff --git a/modules/Vtiger/actions/SaveStar.php b/modules/Vtiger/actions/SaveStar.php
index 3c4944cd01307a9aa092e06c991ea03e9dc873e9..953f2b209d905367d1ad512eee04e6ff498903ab 100644
--- a/modules/Vtiger/actions/SaveStar.php
+++ b/modules/Vtiger/actions/SaveStar.php
@@ -30,6 +30,7 @@ class Vtiger_SaveStar_Action extends Vtiger_Mass_Action {
 			$focus = CRMEntity::getInstance($module);
 			$focus->mode = "edit";
 			$focus->id = $recordId;
+			$focus->column_fields->startTracking();
 			$focus->column_fields['starred'] = $request->get('value');
 			$focus->insertIntoEntityTable($moduleUserSpecificTableName, $module);
 		}