diff --git a/middleware/app_be/views/mongo_db.py b/middleware/app_be/views/mongo_db.py
index 5980813..01a2b4b 100644
--- a/middleware/app_be/views/mongo_db.py
+++ b/middleware/app_be/views/mongo_db.py
@@ -16,4 +16,5 @@ class MongoManager:
             MongoManager.__instance = pymongo.MongoClient('127.0.0.1', 27017)
             db = MongoManager.__instance.AIC
             coll = db.metadata
-            coll.create_index("filename",unique=True)
\ No newline at end of file
+            coll.create_index("filename",unique=True)
+            coll.create_index([("loc", pymongo.GEO2D)])
\ No newline at end of file
diff --git a/middleware/app_be/views/rest_api.py b/middleware/app_be/views/rest_api.py
index 54fc50b..4378c9b 100644
--- a/middleware/app_be/views/rest_api.py
+++ b/middleware/app_be/views/rest_api.py
@@ -94,7 +94,9 @@ class ImageEndpoint:
         col = db.metadata
 
         try:
-            resp = col.insert_one(metadata)
+            metadata['location'] = [metadata['longitude'],metadata['latitude']]
+            col.insert_one(metadata)
+
         except:
             print("Could not insert Metadata")