diff --git a/entities.py b/entities.py
index 815e7137f5278a41ccdda0290fc0fc7506fb79ef_ZW50aXRpZXMucHk=..c169e8fd2ec45498de2644292fd86879da05ed3a_ZW50aXRpZXMucHk= 100644
--- a/entities.py
+++ b/entities.py
@@ -46,6 +46,14 @@
                 # Bytes
                 continue
             data[attr] = value
+        for rschema, tschema in entity.e_schema.attribute_definitions():
+            if tschema.type in ('Int', 'Float'):
+                attr = rschema.type
+                try:
+                    value = entity.cw_attr_cache[attr]
+                except KeyError:
+                    continue
+                data[attr] = value
         return data
 
 
diff --git a/es.py b/es.py
index 815e7137f5278a41ccdda0290fc0fc7506fb79ef_ZXMucHk=..c169e8fd2ec45498de2644292fd86879da05ed3a_ZXMucHk= 100644
--- a/es.py
+++ b/es.py
@@ -75,6 +75,12 @@
         var = next(varmaker)
         rql.append('%s %s %s' % (V, attr, var))
         selected.append((attr, var))
+    for rschema, tschema in schema.eschema(etype).attribute_definitions():
+        if tschema.type in ('Int', 'Float'):
+            attr = rschema.type
+            var = next(varmaker)
+            rql.append('%s %s %s' % (V, attr, var))
+            selected.append((attr, var))
     for attr in ('creation_date', 'modification_date'):
         var = next(varmaker)
         rql.append('%s %s %s' % (V, attr, var))