diff --git a/mis_builder/models/mis_builder.py b/mis_builder/models/mis_builder.py
index d7acf0b3..021ee4e8 100644
--- a/mis_builder/models/mis_builder.py
+++ b/mis_builder/models/mis_builder.py
@@ -657,6 +657,8 @@ class mis_report_instance_period(orm.Model):
                 except:
                     kpi_style = None
 
+                drilldown = bool(aep.get_aml_domain_for_expr(kpi.expression))
+
                 res[kpi.name] = {
                     'val': kpi_val,
                     'val_r': kpi_val_rendered,
@@ -668,6 +670,7 @@ class mis_report_instance_period(orm.Model):
                     'is_percentage': kpi.type == 'pct',
                     'period_id': c.id,
                     'period_name': c.name,
+                    'drilldown': drilldown,
                 }
 
             if len(recompute_queue) == 0:
diff --git a/mis_builder/static/src/css/custom.css b/mis_builder/static/src/css/custom.css
index 7969e27d..d436f6c4 100644
--- a/mis_builder/static/src/css/custom.css
+++ b/mis_builder/static/src/css/custom.css
@@ -1,6 +1,11 @@
-.openerp .ralign {
+.mis_builder_ralign {
   text-align: right;
 }
-.openerp a.mis_builder {
- color: #4c4c4c;
+
+a.mis_builder_drilldown {
+  color: inherit;
+}
+
+a.mis_builder_drilldown:hover {
+  text-decoration: underline;
 }
\ No newline at end of file
diff --git a/mis_builder/static/src/xml/mis_widget.xml b/mis_builder/static/src/xml/mis_widget.xml
index 540f4cf7..a78f5c26 100644
--- a/mis_builder/static/src/xml/mis_widget.xml
+++ b/mis_builder/static/src/xml/mis_widget.xml
@@ -6,7 +6,7 @@
                 <tr class="oe_list_header_columns">
                     <th class="oe_list_header_char"></th>
                     <t t-foreach="widget.mis_report_data.header" t-as="h">
-                    <th t-foreach="h_value.cols" t-as="header" class="oe_list_header_char ralign">
+                    <th t-foreach="h_value.cols" t-as="header" class="oe_list_header_char mis_builder_ralign">
                         <div>
                             <t t-esc="header.name"/>
                         </div>
@@ -25,17 +25,21 @@
                         </div>
                     </td>
                     <t t-foreach="c_value.cols" t-as="value">
-                        <td class="ralign open_account_move" t-att="{'style': c_value.default_style}">
-                            <div t-att="{'style': value_value.style}">
-                                <a t-att="{'title': value_value.val_c}"
-                                   class="mis_builder"
-                                   href="javascript:void(0)"
-                                   t-att-data-val="JSON.stringify(value_value.val)"
-                                   t-att-data-val-c="JSON.stringify(value_value.val_c)"
-                                   t-att-data-period-id="JSON.stringify(value_value.period_id)"
-                                   t-att-data-period-name="JSON.stringify(value_value.period_name)">
+                        <td class="mis_builder_ralign open_account_move" t-att="{'style': c_value.default_style}">
+                            <div t-att="{'style': value_value.style, 'title': value_value.val_c}">
+                                <t t-if="value_value.drilldown">
+                                    <a href="javascript:void(0)"
+                                       class="mis_builder_drilldown"
+                                       t-att-data-val="JSON.stringify(value_value.val)"
+                                       t-att-data-val-c="JSON.stringify(value_value.val_c)"
+                                       t-att-data-period-id="JSON.stringify(value_value.period_id)"
+                                       t-att-data-period-name="JSON.stringify(value_value.period_name)">
                                         <t t-esc="value_value.val_r"/>
-                                </a>
+                                    </a>
+                                </t>
+                                <t t-if="!value_value.drilldown">
+                                    <t t-esc="value_value.val_r"/>
+                                </t>
                             </div>
                         </td>
                     </t>