diff --git a/public/controllers/agents.js b/public/controllers/agents.js
index 4e0e528d4..aa8aff75c 100644
--- a/public/controllers/agents.js
+++ b/public/controllers/agents.js
@@ -108,6 +108,20 @@ app.controller('agentsController', function ($scope, $route, alertify, sharedPro
             }, printError);
     };
 
+    $scope.fetchFim = function (agent) {
+        DataFactory.getAndClean('get', '/syscheck/' + agent.id + '/files', { 'offset': 0, 'limit': 5 })
+            .then(function (data) {
+                $scope.agentFetchInfo[agent.id].syscheckEvents = data.data.items;
+            }, printError);
+    };
+
+    $scope.fetchRootcheck = function (agent) {
+        DataFactory.getAndClean('get', '/rootcheck/' + agent.id, { 'offset': 0, 'limit': 5 })
+            .then(function (data) {
+                $scope.agentFetchInfo[agent.id].rootcheckEvents = data.data.items;
+            }, printError);
+    };
+
     $scope.restart = function (agent) {
         alertify.delay(5000).closeLogOnClick(true).log('Restarting agent...');
         DataFactory.getAndClean('put', '/agents/'+agent.id+'/restart', {})
diff --git a/public/templates/agents-metrics.html b/public/templates/agents-metrics.html
index 850bab5e0..b8f63242e 100644
--- a/public/templates/agents-metrics.html
+++ b/public/templates/agents-metrics.html
@@ -1,4 +1,4 @@
-<div ng-if="!load">
+<div>
 	<ul class="wazuh-submenu">
 		<li><a  href="/app/wazuh#/agents">Overview</a></li>
 		<li class="active"><a>Metrics</a></li>
diff --git a/public/templates/agents.html b/public/templates/agents.html
index 666398516..d9fed6da4 100644
--- a/public/templates/agents.html
+++ b/public/templates/agents.html
@@ -1,4 +1,4 @@
-<div ng-if="!load">
+<div>
 	<ul class="wazuh-submenu">
 		<li class="active"><a>Overview</a></li>
 		<li><a href="/app/wazuh#/agents/metrics">Metrics</a></li>
@@ -72,8 +72,8 @@
 				<div style="" class="agent_card_detail" ng-show="showDetails">
 					<ul id="agentsTabs">
 						<li><a ng-click="setTab(1,$index)" href="" ng-class="{ active: isSetTab(1,$index) }" class="active">Global</a></li>
-						<li><a ng-click="setTab(2,$index)" href="" ng-class="{ active: isSetTab(2,$index) }">File integrity</a></li>
-						<li><a ng-click="setTab(3,$index)" href="" ng-class="{ active: isSetTab(3,$index) }">Rootcheck</a></li>
+						<li><a ng-click="isSetTab(2,$index) ? null : fetchFim(agent); setTab(2,$index);" href="" ng-class="{ active: isSetTab(2,$index) }">File integrity</a></li>
+						<li><a ng-click="isSetTab(3,$index) ? null: fetchRootcheck(agent); setTab(3,$index);" href="" ng-class="{ active: isSetTab(3,$index) }">Rootcheck</a></li>
 						<li><a ng-click="setTab(4,$index)" href="" ng-class="{ active: isSetTab(4,$index) }">Discover</a></li>
 						<li><a ng-click="setTab(5,$index)" href="" ng-class="{ active: isSetTab(5,$index) }">Dashboards</a></li>
 					</ul>
@@ -158,14 +158,28 @@
 											<td class="table-agent-information-td-title">Last scan ended</td>
 											<td class="table-agent-information-td-value ng-binding">{{agentFetchInfo[agent.id].syscheckEndTime}}</td>
 										</tr>
-										<tr>
-											<td class="table-agent-information-td-title" ng-click="loadFIM(agent.id);">File integrity overview</td>
-											<td class="table-agent-information-td-value ng-binding"><span class="glyphicon glyphicon-chevron-right" ng-click="loadFIM(agent.id);"></span></td>
+										<tr ng-if="agentFetchInfo[agent.id].syscheckEvents">
+											<td class="table-agent-information-td-title" colspan="2">Last events:</td>
+										</tr>
+										<tr ng-repeat="event in agentFetchInfo[agent.id].syscheckEvents" ng-if="agentFetchInfo[agent.id].syscheckEvents">
+											<td class="table-event-information-td-value ng-binding" style="width: 80px; overflow: hidden; padding-top: 10px;">{{event.event.charAt(0).toUpperCase() + event.event.slice(1)}}</td>
+											<td class="table-event-information-td-value ng-binding" style="width: 320px; overflow: hidden; padding-top: 10px;"><b>MD5: </b>{{event.md5}}</td>
+											<td class="table-event-information-td-value ng-binding" style="width: 60px; padding-top: 10px;"><span tooltips tooltip-template="{{event.permissions}}">{{event.octalMode.slice(-4)}}</span></td>
+											<td class="table-event-information-td-value ng-binding" style="width: 90px; padding-bottom: 0px;"><span tooltips tooltip-template="User Id: {{event.uid}}</br>Group Id: {{event.gid}}">
+                            					<span style="float: left; clear: left;"><b>U: </b>{{event.user}}</span>
+												<span style="float: left; clear: left;"><b>G: </b>{{event.group}}</span></span>
+											</td>
+											<td class="table-event-information-td-value ng-binding" style="float: right; width: 200px; text-align: center; padding-top: 10px;">{{event.modificationDate}}</td>
 										</tr>
 									</tbody>
 								</table>
 							</div>
 							<ul class="agentsTabs-controlButtons">
+								<li>
+									<a ng-click="loadFIM(agent.id);">
+										<span class="form-group-addon glyphicon glyphicon-share iconControl"></span> Details
+									</a>
+								</li>
 								<li>
 									<a ng-click="runSyscheck(agent);">
 										<span class="form-group-addon glyphicon glyphicon-repeat iconControl"></span> Restart scan
@@ -190,14 +204,26 @@
 											<td class="table-agent-information-td-title">Last scan ended</td>
 											<td class="table-agent-information-td-value ng-binding">{{agentFetchInfo[agent.id].rootcheckEndTime}}</td>
 										</tr>
-										<tr>
-											<td class="table-agent-information-td-title" ng-click="loadRootcheck(agent.id);">Rootcheck overview</td>
-											<td class="table-agent-information-td-value ng-binding"><span class="glyphicon glyphicon-chevron-right" ng-click="loadRootcheck(agent.id);"></span></td>
+										<tr ng-if="agentFetchInfo[agent.id].rootcheckEvents">
+											<td class="table-agent-information-td-title" colspan="2">Last events:</td>
+										</tr>
+										<tr ng-repeat="event in agentFetchInfo[agent.id].rootcheckEvents" ng-if="agentFetchInfo[agent.id].rootcheckEvents">
+											<td class="table-agent-information-td-value ng-binding" style="width: 565px; height: 50px; overflow: hidden; white-space: nowrap;">
+												{{event.event}}
+											</td>
+											<td class="table-agent-information-td-value ng-binding">
+												<span class="upperDate">First scan: {{event.oldDay}}</span><span class="bottomDate" style="padding-left: 2px;">Last scan: {{event.readDay}}</span>
+											</td>
 										</tr>
 									</tbody>
 								</table>
 							</div>
 							<ul class="agentsTabs-controlButtons">
+								<li>
+									<a ng-click="loadRootcheck(agent.id);">
+										<span class="form-group-addon glyphicon glyphicon-share iconControl"></span> Details
+									</a>
+								</li>
 								<li>
 									<a ng-click="runSyscheck(agent);">
 										<span class="form-group-addon glyphicon glyphicon-repeat iconControl"></span> Restart scan
diff --git a/public/templates/compliance-pci.html b/public/templates/compliance-pci.html
index 928d78226..cd25e1ba1 100644
--- a/public/templates/compliance-pci.html
+++ b/public/templates/compliance-pci.html
@@ -1,4 +1,4 @@
-<div ng-if="!load">
+<div>
   <ul class="wazuh-submenu">
     <li><a href="/app/wazuh#/compliance">Rootcheck</a></li>
     <li><a href="/app/wazuh#/compliance/dashboard">Rootcheck dashboard</a></li>
diff --git a/public/templates/compliance-rcdashboard.html b/public/templates/compliance-rcdashboard.html
index 27d1a00a9..f573d65a9 100644
--- a/public/templates/compliance-rcdashboard.html
+++ b/public/templates/compliance-rcdashboard.html
@@ -1,4 +1,4 @@
-<div ng-if="!load">
+<div>
   <ul class="wazuh-submenu">
     <li><a href="/app/wazuh#/compliance">Rootcheck</a></li>
     <li class="active"><a>Rootcheck dashboard</a></li>
diff --git a/public/templates/compliance.html b/public/templates/compliance.html
index 745e0ccb9..da9bea8ee 100644
--- a/public/templates/compliance.html
+++ b/public/templates/compliance.html
@@ -1,4 +1,4 @@
-<div ng-if="!load">
+<div>
   <ul class="wazuh-submenu">
     <li class="active"><a>Rootcheck</a></li>
     <li><a href="/app/wazuh#/compliance/dashboard">Rootcheck dashboard</a></li>
diff --git a/public/templates/fim.html b/public/templates/fim.html
index 6f4b92229..0d73900d0 100644
--- a/public/templates/fim.html
+++ b/public/templates/fim.html
@@ -1,4 +1,4 @@
-<div ng-if="!load">
+<div>
   <ul class="wazuh-submenu">
     <li class="active"><a>Overview</a></li>
     <li><a href="/app/wazuh#/fim/dashboard">Dashboard</a></li>
diff --git a/public/templates/manager-osseclog.html b/public/templates/manager-osseclog.html
index ce7e6cbad..9deb24d5e 100644
--- a/public/templates/manager-osseclog.html
+++ b/public/templates/manager-osseclog.html
@@ -1,4 +1,4 @@
-<div ng-if="!load">
+<div>
   <ul class="wazuh-submenu">
     <li><a href="/app/wazuh#/manager">Overview</a></li>
     <li class="active"><a>OSSEC Logs</a></li>
diff --git a/public/templates/manager.html b/public/templates/manager.html
index 703de08bd..4d8d04406 100644
--- a/public/templates/manager.html
+++ b/public/templates/manager.html
@@ -1,4 +1,4 @@
-<div ng-if="!load">
+<div>
   <ul class="wazuh-submenu">
     <li class="active"><a>Overview</a></li>
     <li><a href="/app/wazuh#/manager/osseclog">OSSEC Logs</a></li>
diff --git a/public/templates/ruleset-decoders.html b/public/templates/ruleset-decoders.html
index 08148e34d..ab39368bf 100644
--- a/public/templates/ruleset-decoders.html
+++ b/public/templates/ruleset-decoders.html
@@ -1,124 +1,122 @@
-<div ng-controller="decodersController">
-    <div ng-if="!load">
-        <ul class="wazuh-submenu">
-            <li><a href="/app/wazuh#/ruleset">Rules</a></li>
-            <li class="active"><a>Decoders</a></li>
-            <li><a href="/app/wazuh#/ruleset/update">Update</a></li>
-        </ul>
+<div>
+    <ul class="wazuh-submenu">
+        <li><a href="/app/wazuh#/ruleset">Rules</a></li>
+        <li class="active"><a>Decoders</a></li>
+        <li><a href="/app/wazuh#/ruleset/update">Update</a></li>
+    </ul>
+</div>
+<div ng-controller="decodersController" class="container">
+    <div ng-if="load" style="text-align: center;">
+        <img style="display: inline-block; width: auto;" src="/plugins/wazuh/img/loading.gif"></img>
     </div>
-    <div class="container">
-        <div ng-if="load" style="text-align: center;">
-            <img style="display: inline-block; width: auto;" src="/plugins/wazuh/img/loading.gif"></img>
-        </div>
-        <div class="row containerRuleset" ng-if="!load">
-            <div id="messages" ng-show="message" class="settings-message-error" ng-bind-html="message">{{ message }}</div>
-            <div class="leftCol">
-                <h2 class="container_page_title">Decoders</h2>
-                <div style="width: 19%; height: 35px; border-radius: 4px; background-color: rgb(249, 249, 249); border: 1px solid rgb(204, 204, 204); float: left;">
-                    <div style="float: left;">
-                        <form class="form-inline ng-pristine ng-valid">
-                            <div class="form-group" style="position: relative;">
-                                <i class="fa fa-search input_search_icon"></i>
-                                <input type="text" ng-model="$parent.decoder_search" ng-change="objGet('/decoders', 'decoders')" class="form-control ng-pristine ng-untouched ng-valid rulesetSearch"
-                                    placeholder="Search...">
+    <div class="row containerRuleset" ng-if="!load">
+        <div id="messages" ng-show="message" class="settings-message-error" ng-bind-html="message">{{ message }}</div>
+        <div class="leftCol">
+            <h2 class="container_page_title">Decoders</h2>
+            <div style="width: 19%; height: 35px; border-radius: 4px; background-color: rgb(249, 249, 249); border: 1px solid rgb(204, 204, 204); float: left;">
+                <div style="float: left;">
+                    <form class="form-inline ng-pristine ng-valid">
+                        <div class="form-group" style="position: relative;">
+                            <i class="fa fa-search input_search_icon"></i>
+                            <input type="text" ng-model="$parent.decoder_search" ng-change="objGet('/decoders', 'decoders')" class="form-control ng-pristine ng-untouched ng-valid rulesetSearch"
+                                placeholder="Search...">
+                        </div>
+                    </form>
+                </div>
+            </div>
+            <div style="margin-left: 10px; width: 202px; height: 35px; border-radius: 4px; background-color: rgb(249, 249, 249); border: 1px solid rgb(204, 204, 204); float: left; text-align: left;">
+                <div ng-class="{ ruleset_button_active: dfType == 'all' }" ng-click="setDecodersFilter('type', 'all')" style="font-weight: bold; border-radius: 0px; width: 100px;"
+                    class="rulesetFilter">All decoders </div>
+                <div ng-class="{ ruleset_button_active: dfType == 'parents' }" ng-click="setDecodersFilter('type', 'parents')" style="font-weight: bold; border-radius: 0px; width: 100px;"
+                    class="rulesetFilter">Parents </div>
+            </div>
+            <div class="filterActive_div" ng-if="hasDecodersFilter('file');">
+                <span ng-click="setDecodersFilter('file', dfFile)" ng-class="{ textFilterActive_header: isSetTabDecodersFilter('file', dfFile) }"
+                    class="bold" tooltips tooltip-size="large" tooltip-side="left" tooltip-template="{{dfFile}}">Selected file: {{formatFile(dfFile)}}   <span class="glyphicon glyphicon-remove"></span></span>
+            </div>
+            <div class="filterActive_div" ng-if="hasDecodersFilter('id');">
+                <span ng-click="setDecodersFilter('id', dfId)" ng-class="{ textFilterActive_header: isSetTabDecodersFilter('id', dfId) }"
+                    class="bold">Selected parent: {{dfId}}   <span class="glyphicon glyphicon-remove"></span></span>
+            </div>
+            <div class="rulesetContentTabs">
+                <div id="decodersTab">
+                    <div class="rules_card_list" ng-repeat="decoder in decoders">
+                        <div class="rule_card" ng-class="{ rule_card_active: showDetails }" ng-click=" showDetails = ! showDetails; ">
+                            <div class="float_left">
+                                <div class="text" style="width: 535px; height: 45px; overflow: hidden;">{{decoder.name}}</div>
                             </div>
-                        </form>
-                    </div>
-                </div>
-                <div style="margin-left: 10px; width: 202px; height: 35px; border-radius: 4px; background-color: rgb(249, 249, 249); border: 1px solid rgb(204, 204, 204); float: left; text-align: left;">
-                    <div ng-class="{ ruleset_button_active: dfType == 'all' }" ng-click="setDecodersFilter('type', 'all')" style="font-weight: bold; border-radius: 0px; width: 100px;"
-                        class="rulesetFilter">All decoders </div>
-                    <div ng-class="{ ruleset_button_active: dfType == 'parents' }" ng-click="setDecodersFilter('type', 'parents')" style="font-weight: bold; border-radius: 0px; width: 100px;"
-                        class="rulesetFilter">Parents </div>
-                </div>
-                <div class="filterActive_div" ng-if="hasDecodersFilter('file');">
-                    <span ng-click="setDecodersFilter('file', dfFile)" ng-class="{ textFilterActive_header: isSetTabDecodersFilter('file', dfFile) }"
-                        class="bold" tooltips tooltip-size="large" tooltip-side="left" tooltip-template="{{dfFile}}">Selected file: {{formatFile(dfFile)}}   <span class="glyphicon glyphicon-remove"></span></span>
-                </div>
-                <div class="filterActive_div" ng-if="hasDecodersFilter('id');">
-                    <span ng-click="setDecodersFilter('id', dfId)" ng-class="{ textFilterActive_header: isSetTabDecodersFilter('id', dfId) }"
-                        class="bold">Selected parent: {{dfId}}   <span class="glyphicon glyphicon-remove"></span></span>
-                </div>
-                <div class="rulesetContentTabs">
-                    <div id="decodersTab">
-                        <div class="rules_card_list" ng-repeat="decoder in decoders">
-                            <div class="rule_card" ng-class="{ rule_card_active: showDetails }" ng-click=" showDetails = ! showDetails; ">
-                                <div class="float_left">
-                                    <div class="text" style="width: 535px; height: 45px; overflow: hidden;">{{decoder.name}}</div>
-                                </div>
-                                <div class="float_right">
-                                    <div class="level" tooltips tooltip-template="Position">{{decoder.position}}</div>
-                                </div>
+                            <div class="float_right">
+                                <div class="level" tooltips tooltip-template="Position">{{decoder.position}}</div>
                             </div>
-                            <div style="" class="rule_card_detail" ng-show="showDetails">
-                                <div class="ruleTabs-container">
-                                    <div class="ruleTabs-info">
-                                        <div class="ruleTabs-box">
-                                            <table class="table-rule-information">
-                                                <tbody>
-                                                    <tr>
-                                                        <td class="table-rule-information-td-title">Name</td>
-                                                        <td class="table-rule-information-td-value ng-binding" colspan="2">{{decoder.name}}</td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="table-rule-information-td-title">File</td>
-                                                        <td class="table-rule-information-td-value ng-binding ng-clickable" colspan="2" ng-click="setDecodersFilter('file', decoder.file);">{{decoder.file}}</td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="table-rule-information-td-title">Full path</td>
-                                                        <td class="table-rule-information-td-value ng-binding" colspan="2">{{decoder.full_path}}</td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="table-rule-information-td-title">Position</td>
-                                                        <td class="table-rule-information-td-value ng-binding">{{decoder.position}}</td>
-                                                        <td class="table-rule-information-td-value ng-binding" tooltips tooltip-size="large" tooltip-side="auto" tooltip-template="<div style='width: 300px;'>Place occupied by the decoder in the file.</div>"><span class="glyphicon glyphicon-question-sign"></span></td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="table-rule-information-td-title" ng-if="decoder.details.parent">Parent</td>
-                                                        <td class="table-rule-information-td-value ng-binding ng-clickable" colspan="2" ng-if="decoder.details.parent" ng-click="setDecodersFilter('id', decoder.details.parent);">{{decoder.details.parent}}</td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="table-rule-information-td-title">Advanced details</td>
-                                                    </tr>
-                                                    <tr ng-repeat="(detailk, detailv) in decoder.details" ng-if="detailk != 'parent'">
-                                                        <td class="table-rule-information-td-title"><span class="glyphicon glyphicon-question-sign" tooltips tooltip-size="large"
-                                                                tooltip-side="auto" tooltip-template="{{decoderTooltips(detailk)}}"></span></td>
-                                                        <td class="table-rule-information-td-title">{{detailk}}</td>
-                                                        <td class="table-rule-information-td-value ng-binding" ng-if="(detailk !== 'regex') && (detailk !== 'order')">{{detailv}}</td>
-                                                        <td class="table-rule-information-td-value ng-binding" ng-if="(detailk === 'regex')" ng-bind-html="colorRegex(detailv)">{{colorRegex(detailv)}}</td>
-                                                        <td class="table-rule-information-td-value ng-binding" ng-if="(detailk === 'order')" ng-bind-html="colorOrder(detailv)">{{colorOrder(detailv)}}</td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                        </div>
+                        </div>
+                        <div style="" class="rule_card_detail" ng-show="showDetails">
+                            <div class="ruleTabs-container">
+                                <div class="ruleTabs-info">
+                                    <div class="ruleTabs-box">
+                                        <table class="table-rule-information">
+                                            <tbody>
+                                                <tr>
+                                                    <td class="table-rule-information-td-title">Name</td>
+                                                    <td class="table-rule-information-td-value ng-binding" colspan="2">{{decoder.name}}</td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="table-rule-information-td-title">File</td>
+                                                    <td class="table-rule-information-td-value ng-binding ng-clickable" colspan="2" ng-click="setDecodersFilter('file', decoder.file);">{{decoder.file}}</td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="table-rule-information-td-title">Full path</td>
+                                                    <td class="table-rule-information-td-value ng-binding" colspan="2">{{decoder.full_path}}</td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="table-rule-information-td-title">Position</td>
+                                                    <td class="table-rule-information-td-value ng-binding">{{decoder.position}}</td>
+                                                    <td class="table-rule-information-td-value ng-binding" tooltips tooltip-size="large" tooltip-side="auto" tooltip-template="<div style='width: 300px;'>Place occupied by the decoder in the file.</div>"><span class="glyphicon glyphicon-question-sign"></span></td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="table-rule-information-td-title" ng-if="decoder.details.parent">Parent</td>
+                                                    <td class="table-rule-information-td-value ng-binding ng-clickable" colspan="2" ng-if="decoder.details.parent" ng-click="setDecodersFilter('id', decoder.details.parent);">{{decoder.details.parent}}</td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="table-rule-information-td-title">Advanced details</td>
+                                                </tr>
+                                                <tr ng-repeat="(detailk, detailv) in decoder.details" ng-if="detailk != 'parent'">
+                                                    <td class="table-rule-information-td-title"><span class="glyphicon glyphicon-question-sign" tooltips tooltip-size="large"
+                                                            tooltip-side="auto" tooltip-template="{{decoderTooltips(detailk)}}"></span></td>
+                                                    <td class="table-rule-information-td-title">{{detailk}}</td>
+                                                    <td class="table-rule-information-td-value ng-binding" ng-if="(detailk !== 'regex') && (detailk !== 'order')">{{detailv}}</td>
+                                                    <td class="table-rule-information-td-value ng-binding" ng-if="(detailk === 'regex')" ng-bind-html="colorRegex(detailv)">{{colorRegex(detailv)}}</td>
+                                                    <td class="table-rule-information-td-value ng-binding" ng-if="(detailk === 'order')" ng-bind-html="colorOrder(detailv)">{{colorOrder(detailv)}}</td>
+                                                </tr>
+                                            </tbody>
+                                        </table>
                                     </div>
                                 </div>
                             </div>
                         </div>
-                        <span class="glyphicon glyphicon-chevron-left" ng-click="objPrev('/decoders', 'decoders')" ng-show="objHasPrev('/decoders')"></span>
-                        <span class="glyphicon glyphicon-chevron-right" ng-click="objNext('/decoders', 'decoders')" ng-show="objHasNext('/decoders')"></span>
                     </div>
+                    <span class="glyphicon glyphicon-chevron-left" ng-click="objPrev('/decoders', 'decoders')" ng-show="objHasPrev('/decoders')"></span>
+                    <span class="glyphicon glyphicon-chevron-right" ng-click="objNext('/decoders', 'decoders')" ng-show="objHasNext('/decoders')"></span>
                 </div>
             </div>
-            <div class="rightCol" ng-if="enableFileSearch">
-                <div class="filesBlock" style="margin-top: 35px;">
-                    <table class="table-files">
-                        <tr class="table-files-list-tr">
-                            <td class="table-files-list-td"><input type="text" ng-model="$parent.$parent.searchFilesDecoders" ng-change="objGet('/decoders/files', 'filesDecoders')"
-                                    class="form-control ng-pristine ng-valid rulesetSearch ng-touched" placeholder="Search..."></td>
-                        </tr>
-                        <tr ng-class="" class="table-files-list-tr" ng-repeat="file in filesDecoders">
-                            <td class="table-files-list-td"><span ng-click="setDecodersFilter('file', formatFile(file))" ng-class="{ textFilterActive: isSetTabDecodersFilter('file', formatFile(file)) }"
-                                    class="bold" tooltips tooltip-size="large" tooltip-side="left" tooltip-template="{{formatTemplate(file)}}">{{formatFile(file)}}</span></td>
-                        </tr>
-                        <tr class="table-files-list-tr">
-                            <td class="table-files-list-td">
-                                <span class="glyphicon glyphicon-chevron-left" ng-click="objPrev('/decoders/files', 'filesDecoders')" ng-show="objHasPrev('/decoders/files')"></span>
-                                <span class="glyphicon glyphicon-chevron-right" ng-click="objNext('/decoders/files', 'filesDecoders')" ng-show="objHasNext('/decoders/files')"></span>
-                            </td>
-                        </tr>
-                    </table>
-                </div>
+        </div>
+        <div class="rightCol" ng-if="enableFileSearch">
+            <div class="filesBlock" style="margin-top: 35px;">
+                <table class="table-files">
+                    <tr class="table-files-list-tr">
+                        <td class="table-files-list-td"><input type="text" ng-model="$parent.$parent.searchFilesDecoders" ng-change="objGet('/decoders/files', 'filesDecoders')"
+                                class="form-control ng-pristine ng-valid rulesetSearch ng-touched" placeholder="Search..."></td>
+                    </tr>
+                    <tr ng-class="" class="table-files-list-tr" ng-repeat="file in filesDecoders">
+                        <td class="table-files-list-td"><span ng-click="setDecodersFilter('file', formatFile(file))" ng-class="{ textFilterActive: isSetTabDecodersFilter('file', formatFile(file)) }"
+                                class="bold" tooltips tooltip-size="large" tooltip-side="left" tooltip-template="{{formatTemplate(file)}}">{{formatFile(file)}}</span></td>
+                    </tr>
+                    <tr class="table-files-list-tr">
+                        <td class="table-files-list-td">
+                            <span class="glyphicon glyphicon-chevron-left" ng-click="objPrev('/decoders/files', 'filesDecoders')" ng-show="objHasPrev('/decoders/files')"></span>
+                            <span class="glyphicon glyphicon-chevron-right" ng-click="objNext('/decoders/files', 'filesDecoders')" ng-show="objHasNext('/decoders/files')"></span>
+                        </td>
+                    </tr>
+                </table>
             </div>
         </div>
     </div>
diff --git a/public/templates/ruleset-rules.html b/public/templates/ruleset-rules.html
index f0f266536..cc71ef9f0 100644
--- a/public/templates/ruleset-rules.html
+++ b/public/templates/ruleset-rules.html
@@ -1,201 +1,199 @@
-<div ng-controller="rulesController">
-    <div ng-if="!load">
-        <ul class="wazuh-submenu">
-            <li class="active"><a>Rules</a></li>
-            <li><a href="/app/wazuh#/ruleset/decoders">Decoders</a></li>
-            <li><a href="/app/wazuh#/ruleset/update">Update</a></li>
-        </ul>
+<div>
+    <ul class="wazuh-submenu">
+        <li class="active"><a>Rules</a></li>
+        <li><a href="/app/wazuh#/ruleset/decoders">Decoders</a></li>
+        <li><a href="/app/wazuh#/ruleset/update">Update</a></li>
+    </ul>
+</div>
+<div ng-controller="rulesController" class="container">
+    <div ng-if="load" style="text-align: center;">
+        <img style="display: inline-block; width: auto;" src="/plugins/wazuh/img/loading.gif"></img>
     </div>
-    <div class="container">
-        <div ng-if="load" style="text-align: center;">
-            <img style="display: inline-block; width: auto;" src="/plugins/wazuh/img/loading.gif"></img>
-        </div>
-        <div class="row containerRuleset" ng-if="!load">
-            <div id="messages" ng-show="message" class="settings-message-error" ng-bind-html="message">{{ message }}</div>
-            <div class="leftCol">
-                <h2 class="container_page_title">Rules</h2>
-                <div style="width: 19%; height: 35px; border-radius: 4px; background-color: rgb(249, 249, 249); border: 1px solid rgb(204, 204, 204); float: left;">
-                    <div style="float: left;">
-                        <form class="form-inline ng-pristine ng-valid">
-                            <div class="form-group" style="position: relative;">
-                                <i class="fa fa-search input_search_icon"></i>
-                                <input type="text" ng-model="$parent.search" ng-change="objGet('/rules', 'rules')" class="form-control ng-pristine ng-untouched ng-valid rulesetSearch"
-                                    placeholder="Search...">
+    <div class="row containerRuleset" ng-if="!load">
+        <div id="messages" ng-show="message" class="settings-message-error" ng-bind-html="message">{{ message }}</div>
+        <div class="leftCol">
+            <h2 class="container_page_title">Rules</h2>
+            <div style="width: 19%; height: 35px; border-radius: 4px; background-color: rgb(249, 249, 249); border: 1px solid rgb(204, 204, 204); float: left;">
+                <div style="float: left;">
+                    <form class="form-inline ng-pristine ng-valid">
+                        <div class="form-group" style="position: relative;">
+                            <i class="fa fa-search input_search_icon"></i>
+                            <input type="text" ng-model="$parent.search" ng-change="objGet('/rules', 'rules')" class="form-control ng-pristine ng-untouched ng-valid rulesetSearch"
+                                placeholder="Search...">
+                        </div>
+                    </form>
+                </div>
+            </div>
+            <div style="margin-left: 10px; width: 202px; height: 35px; border-radius: 4px; background-color: rgb(249, 249, 249); border: 1px solid rgb(204, 204, 204); float: left; text-align: left;">
+                <div ng-class="{ ruleset_button_active: rfStatus == 'enabled' }" ng-click="setRulesFilter('status', 'enabled')" style="font-weight: bold; border-radius: 0px; width: 100px;"
+                    class="rulesetFilter">Enabled </div>
+                <div ng-class="{ ruleset_button_active: rfStatus == 'disabled' }" ng-click="setRulesFilter('status', 'disabled')" style="font-weight: bold; border-radius: 0px; width: 100px;"
+                    class="rulesetFilter">Disabled </div>
+            </div>
+            <div class="form-group ruleLevel_div">
+                <label class="ruleLevel_label">Alert level:</label>
+                <input type="number" min="0" max="{{$parent.maxLevel}}" step="1" ng-model="$parent.minLevel" class="form-control ng-pristine ng-untouched ng-valid rulesetSearch ruleLevel_input">
+                <label class="ruleLevel_label">-</label>
+                <input type="number" min="{{$parent.minLevel}}" max="15" step="1" ng-model="$parent.maxLevel" class="form-control ng-pristine ng-untouched ng-valid rulesetSearch ruleLevel_input">
+                <button type="submit" class="btn btn-primary btn-manager-restart ruleLevel_input ruleLevel_button" ng-click="setRulesFilter_level();"><span>Change</span></button>
+            </div>
+            </br>
+            </br>
+            <div class="filterActive_div" ng-if="hasRulesFilter('file');">
+                <span ng-click="setRulesFilter('file', rfFiles)" ng-class="{ textFilterActive_header: isSetTabRulesFilter('file', rfFiles) }"
+                    class="bold">Selected file: {{rfFiles}}   <span class="glyphicon glyphicon-remove"></span>                </span>
+                <a class="glyphicon glyphicon-download-alt textFilterActive_glyphicon" ng-init="downloadRuleFile(rfFiles)" ng-href="{{encodedFile}}"
+                    download="file.xml"></a>
+            </div>
+            <div class="filterActive_div" ng-if="hasRulesFilter('group');">
+                <span ng-click="setRulesFilter('group', rfGroups)" ng-class="{ textFilterActive_header: isSetTabRulesFilter('group', rfGroups) }"
+                    class="bold">Selected group: {{rfGroups}}   <span class="glyphicon glyphicon-remove"></span></span>
+            </div>
+            <div class="filterActive_div" ng-if="hasRulesFilter('pci');">
+                <span ng-click="setRulesFilter('pci', rfPci)" ng-class="{ textFilterActive_header: isSetTabRulesFilter('pci', rfPci) }" class="bold">Selected PCI group: {{rfPci}}   <span class="glyphicon glyphicon-remove"></span></span>
+            </div>
+            <div class="rulesetContentTabs">
+                <div id="rulesTab">
+                    <div class="rules_card_list" ng-repeat="rule in rules">
+                        <div class="rule_card" ng-class="{ rule_card_active: showDetails }" ng-click=" showDetails = ! showDetails; ">
+                            <div class="id"> {{rule.id}} </div>
+                            <div class="float_left">
+                                <div class="text" style="width: 535px; height: 45px; overflow: hidden;">{{rule.description}}</div>
                             </div>
-                        </form>
-                    </div>
-                </div>
-                <div style="margin-left: 10px; width: 202px; height: 35px; border-radius: 4px; background-color: rgb(249, 249, 249); border: 1px solid rgb(204, 204, 204); float: left; text-align: left;">
-                    <div ng-class="{ ruleset_button_active: rfStatus == 'enabled' }" ng-click="setRulesFilter('status', 'enabled')" style="font-weight: bold; border-radius: 0px; width: 100px;"
-                        class="rulesetFilter">Enabled </div>
-                    <div ng-class="{ ruleset_button_active: rfStatus == 'disabled' }" ng-click="setRulesFilter('status', 'disabled')" style="font-weight: bold; border-radius: 0px; width: 100px;"
-                        class="rulesetFilter">Disabled </div>
-                </div>
-                <div class="form-group ruleLevel_div">
-                    <label class="ruleLevel_label">Alert level:</label>
-                    <input type="number" min="0" max="{{$parent.maxLevel}}" step="1" ng-model="$parent.minLevel" class="form-control ng-pristine ng-untouched ng-valid rulesetSearch ruleLevel_input">
-                    <label class="ruleLevel_label">-</label>
-                    <input type="number" min="{{$parent.minLevel}}" max="15" step="1" ng-model="$parent.maxLevel" class="form-control ng-pristine ng-untouched ng-valid rulesetSearch ruleLevel_input">
-                    <button type="submit" class="btn btn-primary btn-manager-restart ruleLevel_input ruleLevel_button" ng-click="setRulesFilter_level();"><span>Change</span></button>
-                </div>
-                </br>
-                </br>
-                <div class="filterActive_div" ng-if="hasRulesFilter('file');">
-                    <span ng-click="setRulesFilter('file', rfFiles)" ng-class="{ textFilterActive_header: isSetTabRulesFilter('file', rfFiles) }"
-                        class="bold">Selected file: {{rfFiles}}   <span class="glyphicon glyphicon-remove"></span>                    </span>
-                    <a class="glyphicon glyphicon-download-alt textFilterActive_glyphicon" ng-init="downloadRuleFile(rfFiles)" ng-href="{{encodedFile}}"
-                        download="file.xml"></a>
-                </div>
-                <div class="filterActive_div" ng-if="hasRulesFilter('group');">
-                    <span ng-click="setRulesFilter('group', rfGroups)" ng-class="{ textFilterActive_header: isSetTabRulesFilter('group', rfGroups) }"
-                        class="bold">Selected group: {{rfGroups}}   <span class="glyphicon glyphicon-remove"></span></span>
-                </div>
-                <div class="filterActive_div" ng-if="hasRulesFilter('pci');">
-                    <span ng-click="setRulesFilter('pci', rfPci)" ng-class="{ textFilterActive_header: isSetTabRulesFilter('pci', rfPci) }" class="bold">Selected PCI group: {{rfPci}}   <span class="glyphicon glyphicon-remove"></span></span>
-                </div>
-                <div class="rulesetContentTabs">
-                    <div id="rulesTab">
-                        <div class="rules_card_list" ng-repeat="rule in rules">
-                            <div class="rule_card" ng-class="{ rule_card_active: showDetails }" ng-click=" showDetails = ! showDetails; ">
-                                <div class="id"> {{rule.id}} </div>
-                                <div class="float_left">
-                                    <div class="text" style="width: 535px; height: 45px; overflow: hidden;">{{rule.description}}</div>
-                                </div>
-                                <div class="float_right">
-                                    <div ng-class='getRuleStatusClass(rule);' class="status" ng-style="{ 'border-bottom-right-radius' : (showDetails) ? '0px' : '4px' }"
-                                        tooltips tooltip-size="large" tooltip-side="left" tooltip-template="{{getStatusTooltip(rule)}}"></div>
-                                </div>
-                                <div class="float_right">
-                                    <div class="level" tooltips tooltip-template="Alert level">{{rule.level}}</div>
-                                </div>
+                            <div class="float_right">
+                                <div ng-class='getRuleStatusClass(rule);' class="status" ng-style="{ 'border-bottom-right-radius' : (showDetails) ? '0px' : '4px' }"
+                                    tooltips tooltip-size="large" tooltip-side="left" tooltip-template="{{getStatusTooltip(rule)}}"></div>
                             </div>
-                            <div style="" class="rule_card_detail" ng-show="showDetails">
-                                <div class="ruleTabs-container">
-                                    <div class="ruleTabs-info">
-                                        <div class="ruleTabs-box">
-                                            <table class="table-rule-information">
-                                                <tbody>
-                                                    <tr>
-                                                        <td class="table-rule-information-td-title">ID</td>
-                                                        <td class="table-rule-information-td-value ng-binding">{{rule.id}}</td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="table-rule-information-td-title">Description</td>
-                                                        <td class="table-rule-information-td-value ng-binding" colspan="2">{{rule.description}}</td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="table-rule-information-td-title">Level</td>
-                                                        <td class="table-rule-information-td-value ng-binding ng-clickable" ng-click="setRulesFilter_level_selected(rule.level);">{{rule.level}}</td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="table-rule-information-td-title">File</td>
-                                                        <td class="table-rule-information-td-value ng-binding ng-clickable" ng-click="setRulesFilter_outside('file', rule.file);">{{rule.file}}</td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="table-rule-information-td-title">Groups</td>
-                                                    </tr>
-                                                    <tr ng-repeat="group in rule.groups">
-                                                        <td class="table-rule-information-td-title"> </td>
-                                                        <td class="table-rule-information-td-value ng-binding ng-clickable" ng-click="setRulesFilter_outside('group', group);">{{group}}</td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="table-rule-information-td-title" ng-if="rule.pci.length > 0">PCI groups</td>
-                                                    </tr>
-                                                    <tr ng-repeat="pci in rule.pci">
-                                                        <td class="table-rule-information-td-title"> </td>
-                                                        <td class="table-rule-information-td-value ng-binding ng-clickable" ng-click="setRulesFilter_outside('pci', pci);">{{pci}}</td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td class="table-rule-information-td-title">Advanced details</td>
-                                                    </tr>
-                                                    <tr ng-repeat="(detailk, detailv) in rule.details">
-                                                        <td class="table-rule-information-td-title"><span class="glyphicon glyphicon-question-sign" tooltips tooltip-size="large"
-                                                                tooltip-side="auto" tooltip-template="{{rulesTooltips(detailk)}}"></span></td>
-                                                        <td class="table-rule-information-td-title">{{detailk}}</td>
-                                                        <td class="table-rule-information-td-value ng-binding">{{detailv}}</td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                        </div>
-                                        <ul class="ruleTabs-controlButtons">
-                                            <li>
-                                                <a ng-click="loadRuleDiscover(rule.id)">
-                                                    <span class="form-group-addon glyphicon glyphicon-share iconControl"></span>                                                    Discover alerts
-                                                </a>
-                                            </li>
-                                            <li>
-                                                <a ng-click="loadRuleDashboard(rule.id)">
-                                                    <span class="form-group-addon glyphicon glyphicon-share iconControl"></span>                                                    Dashboard
-                                                </a>
-                                            </li>
-                                        </ul>
+                            <div class="float_right">
+                                <div class="level" tooltips tooltip-template="Alert level">{{rule.level}}</div>
+                            </div>
+                        </div>
+                        <div style="" class="rule_card_detail" ng-show="showDetails">
+                            <div class="ruleTabs-container">
+                                <div class="ruleTabs-info">
+                                    <div class="ruleTabs-box">
+                                        <table class="table-rule-information">
+                                            <tbody>
+                                                <tr>
+                                                    <td class="table-rule-information-td-title">ID</td>
+                                                    <td class="table-rule-information-td-value ng-binding">{{rule.id}}</td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="table-rule-information-td-title">Description</td>
+                                                    <td class="table-rule-information-td-value ng-binding" colspan="2">{{rule.description}}</td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="table-rule-information-td-title">Level</td>
+                                                    <td class="table-rule-information-td-value ng-binding ng-clickable" ng-click="setRulesFilter_level_selected(rule.level);">{{rule.level}}</td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="table-rule-information-td-title">File</td>
+                                                    <td class="table-rule-information-td-value ng-binding ng-clickable" ng-click="setRulesFilter_outside('file', rule.file);">{{rule.file}}</td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="table-rule-information-td-title">Groups</td>
+                                                </tr>
+                                                <tr ng-repeat="group in rule.groups">
+                                                    <td class="table-rule-information-td-title"> </td>
+                                                    <td class="table-rule-information-td-value ng-binding ng-clickable" ng-click="setRulesFilter_outside('group', group);">{{group}}</td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="table-rule-information-td-title" ng-if="rule.pci.length > 0">PCI groups</td>
+                                                </tr>
+                                                <tr ng-repeat="pci in rule.pci">
+                                                    <td class="table-rule-information-td-title"> </td>
+                                                    <td class="table-rule-information-td-value ng-binding ng-clickable" ng-click="setRulesFilter_outside('pci', pci);">{{pci}}</td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="table-rule-information-td-title">Advanced details</td>
+                                                </tr>
+                                                <tr ng-repeat="(detailk, detailv) in rule.details">
+                                                    <td class="table-rule-information-td-title"><span class="glyphicon glyphicon-question-sign" tooltips tooltip-size="large"
+                                                            tooltip-side="auto" tooltip-template="{{rulesTooltips(detailk)}}"></span></td>
+                                                    <td class="table-rule-information-td-title">{{detailk}}</td>
+                                                    <td class="table-rule-information-td-value ng-binding">{{detailv}}</td>
+                                                </tr>
+                                            </tbody>
+                                        </table>
                                     </div>
+                                    <ul class="ruleTabs-controlButtons">
+                                        <li>
+                                            <a ng-click="loadRuleDiscover(rule.id)">
+                                                <span class="form-group-addon glyphicon glyphicon-share iconControl"></span>                                                Discover alerts
+                                            </a>
+                                        </li>
+                                        <li>
+                                            <a ng-click="loadRuleDashboard(rule.id)">
+                                                <span class="form-group-addon glyphicon glyphicon-share iconControl"></span>                                                Dashboard
+                                            </a>
+                                        </li>
+                                    </ul>
                                 </div>
                             </div>
                         </div>
-                        <span class="glyphicon glyphicon-chevron-left" ng-click="objPrev('/rules', 'rules')" ng-show="objHasPrev('/rules')"></span>
-                        <span class="glyphicon glyphicon-chevron-right" ng-click="objNext('/rules', 'rules')" ng-show="objHasNext('/rules')"></span>
                     </div>
+                    <span class="glyphicon glyphicon-chevron-left" ng-click="objPrev('/rules', 'rules')" ng-show="objHasPrev('/rules')"></span>
+                    <span class="glyphicon glyphicon-chevron-right" ng-click="objNext('/rules', 'rules')" ng-show="objHasNext('/rules')"></span>
                 </div>
             </div>
-            <div class="rightCol">
-                <div class="tabBlock">
-                    <ul id="rulesetTabsFilters">
-                        <li><a ng-class="{ active: isSetTab(1, 1) }" href ng-click="setTab(1, 1)">Files</a></li>
-                        <li><a ng-class="{ active: isSetTab(2, 1) }" href ng-click="setTab(2, 1)">Groups</a></li>
-                        <li><a ng-class="{ active: isSetTab(3, 1) }" href ng-click="setTab(3, 1)">PCI</a></li>
-                    </ul>
-                </div>
-                <div class="filesBlock">
-                    <table class="table-files" ng-show="isSetTab(1, 1)">
-                        <tr class="table-files-list-tr">
-                            <td class="table-files-list-td"><input type="text" ng-model="$parent.$parent.searchFilesRules" ng-change="objGet('/rules/files', 'filesRules')"
-                                    class="form-control ng-pristine ng-valid rulesetSearch ng-touched" placeholder="Search..."></td>
-                        </tr>
-                        <tr ng-class="" class="table-files-list-tr" ng-repeat="file in filesRules">
-                            <td class="table-files-list-td"><span ng-click="setRulesFilter('file', file.name)" ng-class="{ textFilterActive: isSetTabRulesFilter('file', file.name) }"
-                                    class="bold">{{file.name}}</span></td>
-                        </tr>
-                        <tr class="table-files-list-tr">
-                            <td class="table-files-list-td">
-                                <span class="glyphicon glyphicon-chevron-left" ng-click="objPrev('/rules/files', 'filesRules')" ng-show="objHasPrev('/rules/files')"></span>
-                                <span class="glyphicon glyphicon-chevron-right" ng-click="objNext('/rules/files', 'filesRules')" ng-show="objHasNext('/rules/files')"></span>
-                            </td>
-                        </tr>
-                    </table>
-                    <table class="table-files" ng-show="isSetTab(2, 1)">
-                        <tr class="table-files-list-tr">
-                            <td class="table-files-list-td"><input type="text" ng-model="$parent.$parent.searchGroupsRules" ng-change="objGet('/rules/groups', 'groupsRules')"
-                                    class="form-control ng-pristine ng-valid rulesetSearch ng-touched" placeholder="Search..."></td>
-                        </tr>
-                        <tr ng-class="" class="table-files-list-tr" ng-repeat="group in groupsRules">
-                            <td class="table-files-list-td"><span ng-click="setRulesFilter('group', group)" ng-class="{ textFilterActive: isSetTabRulesFilter('group', group) }"
-                                    class="bold">{{group}}</span></td>
-                        </tr>
-                        <tr class="table-files-list-tr">
-                            <td class="table-files-list-td">
-                                <span class="glyphicon glyphicon-chevron-left" ng-click="objPrev('/rules/groups', 'groupsRules')" ng-show="objHasPrev('/rules/groups')"></span>
-                                <span class="glyphicon glyphicon-chevron-right" ng-click="objNext('/rules/groups', 'groupsRules')" ng-show="objHasNext('/rules/groups')"></span>
-                            </td>
-                        </tr>
-                    </table>
-                    <table class="table-files" ng-show="isSetTab(3, 1)">
-                        <tr class="table-files-list-tr">
-                            <td class="table-files-list-td"><input type="text" ng-model="$parent.$parent.searchFilesPci" ng-change="objGet('/rules/pci', 'pciGroupsRules')"
-                                    class="form-control ng-pristine ng-valid rulesetSearch ng-touched" placeholder="Search..."></td>
-                        </tr>
-                        <tr ng-class="" class="table-files-list-tr" ng-repeat="pci in pciGroupsRules">
-                            <td class="table-files-list-td"><span ng-click="setRulesFilter('pci', pci)" ng-class="{ textFilterActive: isSetTabRulesFilter('pci', pci) }"
-                                    class="bold">{{pci}}</span></td>
-                        </tr>
-                        <tr class="table-files-list-tr">
-                            <td class="table-files-list-td">
-                                <span class="glyphicon glyphicon-chevron-left" ng-click="objPrev('/rules/pci', 'pciGroupsRules')" ng-show="objHasPrev('/rules/pci')"></span>
-                                <span class="glyphicon glyphicon-chevron-right" ng-click="objNext('/rules/pci', 'pciGroupsRules')" ng-show="objHasNext('/rules/pci')"></span>
-                            </td>
-                        </tr>
-                    </table>
-                </div>
+        </div>
+        <div class="rightCol">
+            <div class="tabBlock">
+                <ul id="rulesetTabsFilters">
+                    <li><a ng-class="{ active: isSetTab(1, 1) }" href ng-click="setTab(1, 1)">Files</a></li>
+                    <li><a ng-class="{ active: isSetTab(2, 1) }" href ng-click="setTab(2, 1)">Groups</a></li>
+                    <li><a ng-class="{ active: isSetTab(3, 1) }" href ng-click="setTab(3, 1)">PCI</a></li>
+                </ul>
+            </div>
+            <div class="filesBlock">
+                <table class="table-files" ng-show="isSetTab(1, 1)">
+                    <tr class="table-files-list-tr">
+                        <td class="table-files-list-td"><input type="text" ng-model="$parent.$parent.searchFilesRules" ng-change="objGet('/rules/files', 'filesRules')"
+                                class="form-control ng-pristine ng-valid rulesetSearch ng-touched" placeholder="Search..."></td>
+                    </tr>
+                    <tr ng-class="" class="table-files-list-tr" ng-repeat="file in filesRules">
+                        <td class="table-files-list-td"><span ng-click="setRulesFilter('file', file.name)" ng-class="{ textFilterActive: isSetTabRulesFilter('file', file.name) }"
+                                class="bold">{{file.name}}</span></td>
+                    </tr>
+                    <tr class="table-files-list-tr">
+                        <td class="table-files-list-td">
+                            <span class="glyphicon glyphicon-chevron-left" ng-click="objPrev('/rules/files', 'filesRules')" ng-show="objHasPrev('/rules/files')"></span>
+                            <span class="glyphicon glyphicon-chevron-right" ng-click="objNext('/rules/files', 'filesRules')" ng-show="objHasNext('/rules/files')"></span>
+                        </td>
+                    </tr>
+                </table>
+                <table class="table-files" ng-show="isSetTab(2, 1)">
+                    <tr class="table-files-list-tr">
+                        <td class="table-files-list-td"><input type="text" ng-model="$parent.$parent.searchGroupsRules" ng-change="objGet('/rules/groups', 'groupsRules')"
+                                class="form-control ng-pristine ng-valid rulesetSearch ng-touched" placeholder="Search..."></td>
+                    </tr>
+                    <tr ng-class="" class="table-files-list-tr" ng-repeat="group in groupsRules">
+                        <td class="table-files-list-td"><span ng-click="setRulesFilter('group', group)" ng-class="{ textFilterActive: isSetTabRulesFilter('group', group) }"
+                                class="bold">{{group}}</span></td>
+                    </tr>
+                    <tr class="table-files-list-tr">
+                        <td class="table-files-list-td">
+                            <span class="glyphicon glyphicon-chevron-left" ng-click="objPrev('/rules/groups', 'groupsRules')" ng-show="objHasPrev('/rules/groups')"></span>
+                            <span class="glyphicon glyphicon-chevron-right" ng-click="objNext('/rules/groups', 'groupsRules')" ng-show="objHasNext('/rules/groups')"></span>
+                        </td>
+                    </tr>
+                </table>
+                <table class="table-files" ng-show="isSetTab(3, 1)">
+                    <tr class="table-files-list-tr">
+                        <td class="table-files-list-td"><input type="text" ng-model="$parent.$parent.searchFilesPci" ng-change="objGet('/rules/pci', 'pciGroupsRules')"
+                                class="form-control ng-pristine ng-valid rulesetSearch ng-touched" placeholder="Search..."></td>
+                    </tr>
+                    <tr ng-class="" class="table-files-list-tr" ng-repeat="pci in pciGroupsRules">
+                        <td class="table-files-list-td"><span ng-click="setRulesFilter('pci', pci)" ng-class="{ textFilterActive: isSetTabRulesFilter('pci', pci) }"
+                                class="bold">{{pci}}</span></td>
+                    </tr>
+                    <tr class="table-files-list-tr">
+                        <td class="table-files-list-td">
+                            <span class="glyphicon glyphicon-chevron-left" ng-click="objPrev('/rules/pci', 'pciGroupsRules')" ng-show="objHasPrev('/rules/pci')"></span>
+                            <span class="glyphicon glyphicon-chevron-right" ng-click="objNext('/rules/pci', 'pciGroupsRules')" ng-show="objHasNext('/rules/pci')"></span>
+                        </td>
+                    </tr>
+                </table>
             </div>
         </div>
     </div>
diff --git a/public/templates/ruleset-update.html b/public/templates/ruleset-update.html
index d7e60428c..7fd97dc82 100644
--- a/public/templates/ruleset-update.html
+++ b/public/templates/ruleset-update.html
@@ -1,65 +1,63 @@
-<div ng-controller="updateRulesetController">
-    <div ng-if="!load">
-        <ul class="wazuh-submenu">
-            <li><a href="/app/wazuh#/ruleset">Rules</a></li>
-            <li><a href="/app/wazuh#/ruleset/decoders">Decoders</a></li>
-            <li class="active"><a>Update</a></li>
-        </ul>
+<div>
+    <ul class="wazuh-submenu">
+        <li><a href="/app/wazuh#/ruleset">Rules</a></li>
+        <li><a href="/app/wazuh#/ruleset/decoders">Decoders</a></li>
+        <li class="active"><a>Update</a></li>
+    </ul>
+</div>
+<div ng-controller="updateRulesetController" class="container">
+    <div ng-if="load" style="text-align: center;">
+        <img style="display: inline-block; width: auto;" src="/plugins/wazuh/img/loading.gif"></img>
     </div>
-    <div class="container">
-        <div ng-if="load" style="text-align: center;">
-            <img style="display: inline-block; width: auto;" src="/plugins/wazuh/img/loading.gif"></img>
-        </div>
-        <div class="row containerRuleset" ng-if="!load">
-            <div id="messages" ng-show="message" class="settings-message-error" ng-bind-html="message">{{ message }}</div>
-            <div class="leftCol">
-                <h2 class="container_page_title">Update</h2>
-                <div id="updaterTab">
-                    <table class="updateGuideTable">
-                        <tbody>
-                            <tr>
-                                <td colspan="2">1. Select what you want to update:</td>
-                            </tr>
-                            <tr>
-                                <td colspan="2">
-                                    <div ng-class="{ ruleset_button_active: $parent.updateType == 'r' }" ng-click="selectUpdateType('r')" style="font-weight: bold; border-radius: 0px; width: 100px; margin-right: 5px;"
-                                        class="rulesetFilter">Rules </div>
-                                    <div ng-class="{ ruleset_button_active: $parent.updateType == 'c' }" ng-click="selectUpdateType('c')" style="font-weight: bold; border-radius: 0px; width: 100px; margin-right: 5px;"
-                                        class="rulesetFilter">Rootcheck </div>
-                                    <div ng-class="{ ruleset_button_active: $parent.updateType == 'b' }" ng-click="selectUpdateType('b')" style="font-weight: bold; border-radius: 0px; width: 100px;"
-                                        class="rulesetFilter">Both </div>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td colspan="2">2. Do you want to force it?</td>
-                            </tr>
-                            <tr>
-                                <td style="padding-right: 5px;">
-                                    <div ng-class="{ ruleset_button_active: !$parent.updateForce }" ng-click="$parent.updateForce = false" style="font-weight: bold; border-radius: 0px; width: 100px;"
-                                        class="rulesetFilter">No </div>
-                                </td>
-                                <td>Update the outdated rules (Manager will be restarted only if enabled rules are updated)</td>
-                            </tr>
-                            <tr>
-                                <td style="padding-right: 5px;">
-                                    <div ng-class="{ ruleset_button_active: $parent.updateForce }" ng-click="$parent.updateForce = true" style="font-weight: bold; border-radius: 0px; width: 100px;"
-                                        class="rulesetFilter">Yes </div>
-                                </td>
-                                <td>Overwrite all the rules (OSSEC manager is going to be restarted)</td>
-                            </tr>
-                            <tr>
-                                <td colspan="2" style="padding-top: 10px;"><button type="submit" class="btn btn-primary btn-manager-restart ruleLevel_input ruleLevel_button"
-                                        style="margin-left: 100px; width: 150px !important;" ng-click="updateRuleset();"><span>Update ruleset</span></button></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <div style="display: inline-block; border-top: 1px solid #cccccc; margin-top: 15px;">
-                        <label style="margin-top: 15px; margin-right: 15px;">Backups:</label>
-                        <div ng-model="$parent.selectedBackup" custom-select="backup for backup in $parent.backups | filter:$searchTerm"></div>
-                        <button type="submit" class="btn btn-primary btn-manager-restart ruleLevel_input ruleLevel_button" style="margin-left: 15px; width: 150px !important;"
-                            ng-click="restoreBackup();"><span>Restore backup</span></button>
-                        <label style="font-weight: lighter;">* When ruleset is updated, a new backup (the first in the list) will be created.</label>
-                    </div>
+    <div class="row containerRuleset" ng-if="!load">
+        <div id="messages" ng-show="message" class="settings-message-error" ng-bind-html="message">{{ message }}</div>
+        <div class="leftCol">
+            <h2 class="container_page_title">Update</h2>
+            <div id="updaterTab">
+                <table class="updateGuideTable">
+                    <tbody>
+                        <tr>
+                            <td colspan="2">1. Select what you want to update:</td>
+                        </tr>
+                        <tr>
+                            <td colspan="2">
+                                <div ng-class="{ ruleset_button_active: $parent.updateType == 'r' }" ng-click="selectUpdateType('r')" style="font-weight: bold; border-radius: 0px; width: 100px; margin-right: 5px;"
+                                    class="rulesetFilter">Rules </div>
+                                <div ng-class="{ ruleset_button_active: $parent.updateType == 'c' }" ng-click="selectUpdateType('c')" style="font-weight: bold; border-radius: 0px; width: 100px; margin-right: 5px;"
+                                    class="rulesetFilter">Rootcheck </div>
+                                <div ng-class="{ ruleset_button_active: $parent.updateType == 'b' }" ng-click="selectUpdateType('b')" style="font-weight: bold; border-radius: 0px; width: 100px;"
+                                    class="rulesetFilter">Both </div>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan="2">2. Do you want to force it?</td>
+                        </tr>
+                        <tr>
+                            <td style="padding-right: 5px;">
+                                <div ng-class="{ ruleset_button_active: !$parent.updateForce }" ng-click="$parent.updateForce = false" style="font-weight: bold; border-radius: 0px; width: 100px;"
+                                    class="rulesetFilter">No </div>
+                            </td>
+                            <td>Update the outdated rules (Manager will be restarted only if enabled rules are updated)</td>
+                        </tr>
+                        <tr>
+                            <td style="padding-right: 5px;">
+                                <div ng-class="{ ruleset_button_active: $parent.updateForce }" ng-click="$parent.updateForce = true" style="font-weight: bold; border-radius: 0px; width: 100px;"
+                                    class="rulesetFilter">Yes </div>
+                            </td>
+                            <td>Overwrite all the rules (OSSEC manager is going to be restarted)</td>
+                        </tr>
+                        <tr>
+                            <td colspan="2" style="padding-top: 10px;"><button type="submit" class="btn btn-primary btn-manager-restart ruleLevel_input ruleLevel_button"
+                                    style="margin-left: 100px; width: 150px !important;" ng-click="updateRuleset();"><span>Update ruleset</span></button></td>
+                        </tr>
+                    </tbody>
+                </table>
+                <div style="display: inline-block; border-top: 1px solid #cccccc; margin-top: 15px;">
+                    <label style="margin-top: 15px; margin-right: 15px;">Backups:</label>
+                    <div ng-model="$parent.selectedBackup" custom-select="backup for backup in $parent.backups | filter:$searchTerm"></div>
+                    <button type="submit" class="btn btn-primary btn-manager-restart ruleLevel_input ruleLevel_button" style="margin-left: 15px; width: 150px !important;"
+                        ng-click="restoreBackup();"><span>Restore backup</span></button>
+                    <label style="font-weight: lighter;">* When ruleset is updated, a new backup (the first in the list) will be created.</label>
                 </div>
             </div>
         </div>
diff --git a/public/utils/kibanaUrlFormatter.js b/public/utils/kibanaUrlFormatter.js
index 13bd02083..f72fd4ac7 100644
--- a/public/utils/kibanaUrlFormatter.js
+++ b/public/utils/kibanaUrlFormatter.js
@@ -30,6 +30,11 @@ exports.newDashboard = function (structure, filter, time, url) {
     }
     if (filter == '') {
         filter = '*';
+    } else {
+        filter = filter.replace(/'/g, "!'");
+        filter = filter.replace(/\\/g, "\\\\");
+        filter = filter.replace(/!/g, "!!");
+        filter = encodeURIComponent(filter);
     }
     if (url) {
         return util.format('/app/kibana#/dashboard?_g=(refreshInterval:(display:Off,pause:!f,value:0),time:(%s))&_a=(filters:!(),options:(darkTheme:!f),panels:!%s,query:(query_string:(analyze_wildcard:!t,query:\'%s\')),title:\'%s\',uiState:())', time, structure, filter, 'New dashboard');
@@ -50,6 +55,11 @@ exports.getDashboard = function (dashboard, filter, time, url) {
     }
     if (filter == '') {
         filter = '*';
+    } else {
+        filter = filter.replace(/'/g, "!'");
+        filter = filter.replace(/\\/g, "\\\\");
+        filter = filter.replace(/!/g, "!!");
+        filter = encodeURIComponent(filter);
     }
     if (dashboards[dashboard] != undefined) {
         var structure = dashboards[dashboard];
@@ -75,6 +85,11 @@ exports.getAlerts = function (index, query, time, url) {
     }
     if (query == '') {
         query = '*';
+    } else {
+        query = query.replace(/'/g, "!'");
+        query = query.replace(/\\/g, "\\\\");
+        query = query.replace(/!/g, "!!");
+        query = encodeURIComponent(query);
     }
     if (url) {
         return util.format('/app/kibana#/discover?_a=(columns:!(_source),index:\'%s\',interval:auto,query:(query_string:(analyze_wildcard:!t,query:\'%s\')),sort:!(\'@timestamp\',desc))&_g=(refreshInterval:(display:Off,pause:!f,value:0),time:(%s))', index, query, time);
@@ -95,6 +110,11 @@ exports.getVisualization = function (visualization, filter, time, url) {
     }
     if (filter == '') {
         filter = '*';
+    } else {
+        filter = filter.replace(/'/g, "!'");
+        filter = filter.replace(/\\/g, "\\\\");
+        filter = filter.replace(/!/g, "!!");
+        filter = encodeURIComponent(filter);
     }
     if (visualizations[visualization] != undefined) {
         var structure = visualizations[visualization];
@@ -121,6 +141,11 @@ exports.newVisualization = function (type, structuredata, filter, time, url) {
     }
     if (filter == '') {
         filter = '*';
+    } else {
+        filter = filter.replace(/'/g, "!'");
+        filter = filter.replace(/\\/g, "\\\\");
+        filter = filter.replace(/!/g, "!!");
+        filter = encodeURIComponent(filter);
     }
     if (url) {
         return util.format('/app/kibana#/visualize/create?indexPattern=ossec-*&type=%s&_g=(refreshInterval:(display:Off,pause:!f,value:0),time:(%s))&_a=(filters:!(),linked:!f,query:(query_string:(analyze_wildcard:!t,query:\'%s\')),uiState:(),%s', type, time, filter, structuredata);