diff --git a/modules/addon/addon.admin.controller.php b/modules/addon/addon.admin.controller.php
index 170d04e66..b7e92e583 100644
--- a/modules/addon/addon.admin.controller.php
+++ b/modules/addon/addon.admin.controller.php
@@ -88,11 +88,6 @@
 				$this->makeCacheFile(0, 'mobile', 'global');
 			}
 
-			// set favorite
-			$oAdminController = &getAdminController('admin');
-			$output = $oAdminController->setFavoritesByModule(-1, 'addon', $favorite);
-			if (!$output->toBool()) return $output;
-
 			$this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAddonAdminIndex'));
 		}
 
diff --git a/modules/addon/addon.admin.view.php b/modules/addon/addon.admin.view.php
index 2ce07849e..41a0725e8 100644
--- a/modules/addon/addon.admin.view.php
+++ b/modules/addon/addon.admin.view.php
@@ -19,17 +19,19 @@
          **/
         function dispAddonAdminIndex() {
 			$oAdminModel = &getAdminModel('admin');
-			$siteModuleInfo = Context::get('site_module_info');
-			$output = $oAdminModel->getFavoriteListByModule(-1, 'addon');
-			if (!$output->toBool()) return $output;
 
-			$favoriteList = $output->get('list');
-			Context::set('favoriteList', $favoriteList);
-
-            $site_module_info = Context::get('site_module_info');
             // Add to the list settings
             $oAddonModel = &getAdminModel('addon');
             $addon_list = $oAddonModel->getAddonListForSuperAdmin();
+
+			$security = new Security($addon_list);
+			$addon_list = $security->encodeHTML('..', '..author..');
+
+			foreach($addon_list as $no => $addon_info)
+			{
+				$addon_list[$no]->description = nl2br(trim($addon_info->description));
+			}
+
             Context::set('addon_list', $addon_list);
 			Context::set('addon_count', count($addon_list));
             // Template specifies the path and file
diff --git a/modules/addon/tpl/addon_list.html b/modules/addon/tpl/addon_list.html
index 21870c8f9..fa23e7576 100644
--- a/modules/addon/tpl/addon_list.html
+++ b/modules/addon/tpl/addon_list.html
@@ -12,7 +12,6 @@
 			<caption>All({$addon_count})</caption>
 			<thead>
 				<tr>
-					<th scope="col">{$lang->favorite}</th>
 					<th scope="col" class="title">{$lang->addon_name}</th>
 					<th scope="col">{$lang->version}</th>
 					<th scope="col">{$lang->author}</th>
@@ -20,23 +19,14 @@
 					<th scope="col">{$lang->cmd_setup}</th>
 					<th scope="col">PC</th>
 					<th scope="col">Mobile</th>
-					<th scope="col">
-						{$lang->fixed}[<a href="#fixed" class="tgAnchor">?</a>]
-						<div id="fixed" class="tgContent layer" style="right:0;">
-							<p>{$lang->about_fixed}</p>
-						</div>
-					</th>
 					<th scope="col">{$lang->cmd_delete}</th>
 				</tr>
 			</thead>
 			<tbody>
 				<tr loop="$addon_list => $addon">
-					<td>
-						<input type="checkbox" name="favorite[]" value="{$addon->addon_name}" checked="checked"|cond="$favoriteList[$addon->addon_name]" />
-					</td>
 					<td class="title">
 						<p><strong>{$addon->title}</strong></p>
-						<p>{cut_str($addon->description, 200)}</p>
+						<p>{$addon->description}</p>
 						<p cond="$addon->need_update == 'Y'" class="update">
 							{$lang->msg_avail_update} <a href="{$addon->update_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">{$lang->msg_do_you_like_update}</a>
 						</p>
@@ -52,7 +42,6 @@
 					<td><a href="{getUrl('act', 'dispAddonAdminSetup', 'selected_addon', $addon->addon_name)}">{$lang->cmd_setup}</a></td>
 					<td><input type="checkbox" name="pc[]" title="PC" value="{htmlspecialchars($addon->addon_name)}" checked="checked"|cond="$addon->activated" /></td>
 					<td><input type="checkbox" name="mobile[]" title="Mobile" value="{htmlspecialchars($addon->addon_name)}" checked="checked"|cond="$addon->mactivated" /></td>
-					<td><input type="checkbox" name="fixed[]" title="{$lang->fixed}" value="{htmlspecialchars($addon->addon_name)}" checked="checked"|cond="$addon->fixed" /></td>
 					<td><a cond="$addon->remove_url" href="{$addon->remove_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">{$lang->cmd_delete}</a></td>
 				</tr>
 			</tbody>