diff --git a/certego_saas/ext/upload/elastic.py b/certego_saas/ext/upload/elastic.py
index 5b09271..070cbd5 100644
--- a/certego_saas/ext/upload/elastic.py
+++ b/certego_saas/ext/upload/elastic.py
@@ -51,7 +51,8 @@ def upload(
         logger.info(f"Uploading {docs.count()} documents")
         jsons = map(lambda x: x.to_bulk(), docs)
         success, errors = bulk(client, jsons, request_timeout=timeout)
-        docs.delete()
+        for doc in docs.iterator():
+            doc.delete()
         return success, errors
 
     def clean(self):
@@ -68,7 +69,7 @@ def __repr__(self):
     from mongoengine import fields as mongo_fields
 
 except ImportError:
-    from django.db.models import JSONField, Model
+    from django.db.models import Index, JSONField, Model
     from django.db.models import fields as django_fields
 
     class BIDocument(__BIDocumentInterface, Model):
@@ -78,6 +79,16 @@ class BIDocument(__BIDocumentInterface, Model):
         count = django_fields.PositiveIntegerField()
         kwargs = JSONField()
 
+        class Meta:
+            indexes = [
+                Index(
+                    fields=[
+                        "index",
+                        "time",
+                    ]
+                )
+            ]
+
 else:
 
     class BIDocument(__BIDocumentInterface, Document):
@@ -88,3 +99,4 @@ class BIDocument(__BIDocumentInterface, Document):
         category = mongo_fields.StringField(required=True)
         count = mongo_fields.IntField(required=True, min_value=0)
         kwargs = mongo_fields.DictField(required=False)
+        meta = {"indexes": ["index", "time"]}
diff --git a/certego_saas/version.py b/certego_saas/version.py
index a10d59f..6852e09 100644
--- a/certego_saas/version.py
+++ b/certego_saas/version.py
@@ -1 +1 @@
-VERSION = "0.7.3"
+VERSION = "0.7.4"