diff --git a/es.py b/es.py
index afd8a876c64c05c4a55b8b9da04adc46e2329f5f_ZXMucHk=..9e6a7b778192f4359edf62a460523917ef8edf61_ZXMucHk= 100644
--- a/es.py
+++ b/es.py
@@ -90,5 +90,7 @@
         rql.append('%s %s %s' % (V, attr, var))
         selected.append(var)
     for rschema, tschema in schema.eschema(etype).attribute_definitions():
+        if rschema.type == 'eid':
+            continue
         if tschema.type in ('Int', 'Float'):
             attr = rschema.type
@@ -93,9 +95,8 @@
         if tschema.type in ('Int', 'Float'):
             attr = rschema.type
-            if eid and attr != 'eid':
-                var = next(varmaker)
-                rql.append('%s %s %s' % (V, attr, var))
-                selected.append(var)
+            var = next(varmaker)
+            rql.append('%s %s %s' % (V, attr, var))
+            selected.append(var)
     for attr in ('creation_date', 'modification_date',) + CUSTOM_ATTRIBUTES.get(etype, ()):
         var = next(varmaker)
         rql.append('%s %s %s' % (V, attr, var))