diff --git a/www/plugins/es/js/services/profile-services.js b/www/plugins/es/js/services/profile-services.js
index 744f6787c9ac804b0214c9f9e68b0956a0bfeb25..7915a90392391511d47c4cd950731d4c980efe0b 100644
--- a/www/plugins/es/js/services/profile-services.js
+++ b/www/plugins/es/js/services/profile-services.js
@@ -184,7 +184,7 @@ angular.module('cesium.es.profile.services', ['cesium.services', 'cesium.es.http
 
     var mixedSearch = text && esSettings.wot.isMixedSearchEnable();
     if (mixedSearch) {
-      request._source = request._source.concat(["description", "thumbnail._content_type", "city", "creationTime", "membersCount"]);
+      request._source = request._source.concat(["description", "thumbnail._content_type", "city", "creationTime", "membersCount", "type"]);
       console.debug("[ES] [profile] Mixed search: enable");
     }
 
@@ -304,7 +304,8 @@ angular.module('cesium.es.profile.services', ['cesium.services', 'cesium.es.http
                 state: 'app.view_{0}'.format(hit._index),
                 stateParams: {id: hit._id, title: hit._source.title},
                 creationTime: hit._source.creationTime,
-                memberCount: hit._source.memberCount
+                memberCount: hit._source.memberCount,
+                type: hit._source.type
               };
               values=[item];
               datas.push(item);
diff --git a/www/plugins/es/templates/registry/lookup_options.html b/www/plugins/es/templates/registry/lookup_options.html
index 47cf25d043fa489212d1222b2c4e1706c2e52cc9..95fc510a914452ba725614a6d5498519bce359ef 100644
--- a/www/plugins/es/templates/registry/lookup_options.html
+++ b/www/plugins/es/templates/registry/lookup_options.html
@@ -11,7 +11,10 @@
 
     <div class="item item-icon-right" ng-if="search.options" ng-click="showRecordTypeModal()">
       <span translate>REGISTRY.SEARCH.TYPE</span>
-      <span class="badge badge-balanced" ng-if="search.type">{{'REGISTRY.TYPE.ENUM.'+search.type|uppercase|translate}}</span>
+      <span class="badge badge-balanced" ng-if="search.type">
+         <i class="cion-page-{{search.type}}"></i>
+        {{'REGISTRY.TYPE.ENUM.'+search.type|uppercase|translate}}
+      </span>
       <i class="gray icon ion-ios-arrow-right"></i>
     </div>
 
diff --git a/www/plugins/es/templates/registry/view_record.html b/www/plugins/es/templates/registry/view_record.html
index 94327f3b07fcf7717160503ccb18c3f02ad3581e..db62b5dff893a62903528c13b5e7683d3b3cf839 100644
--- a/www/plugins/es/templates/registry/view_record.html
+++ b/www/plugins/es/templates/registry/view_record.html
@@ -39,7 +39,7 @@
             </a>
             <span ng-if="formData.city && formData.type">&nbsp;|&nbsp;</span>
             <a ng-if="formData.type" ui-sref="app.registry_lookup({type:formData.type})">
-              <i class="icon ion-flag"></i>
+              <i class="cion-page-{{formData.type}}"></i>
               {{'REGISTRY.TYPE.ENUM.'+formData.type|upper|translate}}
             </a>
           </h2>
@@ -91,7 +91,7 @@
         </div>
 
         <ion-item>
-          <h2 ng-bind-html="formData.description"></h2>
+          <h2 trust-as-html="formData.description"></h2>
         </ion-item>
 
         <ion-item>
diff --git a/www/plugins/es/templates/wot/lookup_item_page.html b/www/plugins/es/templates/wot/lookup_item_page.html
index d4a30ebaf9873ca428fd4dd109fbbf00cbfdb0fc..6b1a069cd367d7eede68814243e160594a12a86a 100644
--- a/www/plugins/es/templates/wot/lookup_item_page.html
+++ b/www/plugins/es/templates/wot/lookup_item_page.html
@@ -8,6 +8,11 @@
     <i class="ion-location"></i>
     {{::item.city|truncText}}
   </span>
+  <span ng-if="::item.city && item.type">|</span>
+  <span ng-if="item.type">
+    <i class="cion-page-{{item.type}}"></i>
+    {{::'REGISTRY.TYPE.ENUM.'+item.type|uppercase|translate}}
+  </span>
 </h4>
 <h4 class="dark">
   <span class="dark" ng-if="::item.description">