diff --git a/templates/base/components/datatable/static/formtablerow/layout.html.twig b/templates/base/components/datatable/static/formtablerow/layout.html.twig
index 7a8651a08..bc8d55809 100644
--- a/templates/base/components/datatable/static/formtablerow/layout.html.twig
+++ b/templates/base/components/datatable/static/formtablerow/layout.html.twig
@@ -1,10 +1,9 @@
 {# @copyright   Copyright (C) 2010-2021 Combodo SARL #}
 {# @license     http://opensource.org/licenses/AGPL-3.0 #}
 
-<tr role="row" id="{{ oUIBlock.GetRef() }}_row_{{ oUIBlock.GetRowId() }}" {% for cellName,cellValue in oUIBlock.GetData() %}  
-        {% if cellName == '@id' %}id="{{ cellValue }}" {% endif %}
-        {% if cellName == '@class' %} class="{{ cellValue }}"{% endif %}
-        {% if cellName == '@meta' %} {{ cellValue | raw}}{% endif %}{% endfor %}
+<tr role="row" id="{{ oUIBlock.GetRef() }}_row_{{ oUIBlock.GetRowId() }}" {% for cellName,cellValue in oUIBlock.GetData() %}
+        {% if cellName is same as('@class') %} class="{{ cellValue }}"{% endif %}
+        {% if cellName is same as('@meta') %} {{ cellValue | raw}}{% endif %}{% endfor %}
 >
     {% for colName,column in oUIBlock.GetColumns() %}
         <td>
@@ -20,5 +19,4 @@
             {{ cellValueHtml|raw }}
         </td>
     {% endfor %}
-</tr>
-
+</tr>
\ No newline at end of file