diff --git a/cms/migrations/0013_rename_place_id_place_id_and_more.py b/cms/migrations/0013_rename_place_id_place_id_and_more.py
new file mode 100644
index 0000000..68e04af
--- /dev/null
+++ b/cms/migrations/0013_rename_place_id_place_id_and_more.py
@@ -0,0 +1,22 @@
+# Generated by Django 4.2.13 on 2024-09-04 10:23
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("cms", "0012_rename_activity_id_activity_id_and_more"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="place",
+            old_name="place_id",
+            new_name="id",
+        ),
+        migrations.RenameField(
+            model_name="place",
+            old_name="place_name",
+            new_name="name",
+        ),
+    ]
diff --git a/cms/migrations/0014_rename_id_activity_activity_id_and_more.py b/cms/migrations/0014_rename_id_activity_activity_id_and_more.py
new file mode 100644
index 0000000..3947d81
--- /dev/null
+++ b/cms/migrations/0014_rename_id_activity_activity_id_and_more.py
@@ -0,0 +1,32 @@
+# Generated by Django 4.2.13 on 2024-09-04 10:26
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("cms", "0013_rename_place_id_place_id_and_more"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="activity",
+            old_name="id",
+            new_name="activity_id",
+        ),
+        migrations.RenameField(
+            model_name="activity",
+            old_name="name",
+            new_name="activity_name",
+        ),
+        migrations.RenameField(
+            model_name="place",
+            old_name="id",
+            new_name="place_id",
+        ),
+        migrations.RenameField(
+            model_name="place",
+            old_name="name",
+            new_name="place_name",
+        ),
+    ]
diff --git a/cms/models.py b/cms/models.py
index 6c4a97e..9eafdae 100644
--- a/cms/models.py
+++ b/cms/models.py
@@ -61,8 +61,8 @@ def __str__(self):
 # column1=place_id,column2=place_name,column3=description,column4=district_id,column5=province_id,column6=ticket_price,column7=location,column8=latitude,column9=longitude,column10=how_to_visit,,column11=best_time_to_visit_in_year,,column12=data
 
 class Activity(TimeStampMixin):
-    id = models.AutoField(primary_key=True)
-    name = models.CharField(max_length=255)
+    activity_id = models.AutoField(primary_key=True)
+    activity_name = models.CharField(max_length=255)
     description = models.TextField(null=True, blank=True)
     data = models.JSONField(null=True, blank=True)
 # column1=activity_id,column2=activity_name,column3=description,column4=data
diff --git a/cms/views.py b/cms/views.py
index fe2afb6..1020932 100644
--- a/cms/views.py
+++ b/cms/views.py
@@ -106,23 +106,20 @@ def get_places(self, request, pk=None):
                 }
             }
         
-        # place_type = json_input.get("type")
+        place_type = json_input.get("type")
         district = json_input.get("district")
-                # activities = json_input.get("activities")
+        # activities = json_input.get("activities")
         # activity_type = json_input.get("props", {}).get("type")
-        # price = json_input.get("props").get("price")
+        # price = json_input.get("price")
 
         # Construct the query based on the input fields
         query = Q()
 
-        # if place_type:
-        #     query &= Q(types__name__icontains=place_type)
-        
-        # if district:
-        #     query &= Q(district__name__icontains=district)
+        if place_type:
+            query &= Q(types__name__icontains=place_type)
 
         # if activities:
-        #     query &= Q(activities__name__icontains=activities)
+        #     query &= Q(activities__activity_name__icontains=activities)
 
         # if activity_type:
         #     query &= Q(types__name__icontains=activity_type)
diff --git a/gemini/gemini.py b/gemini/gemini.py
index 4911a4a..224df89 100644
--- a/gemini/gemini.py
+++ b/gemini/gemini.py
@@ -261,10 +261,10 @@ def get_plan1(duration=7, preferred_activities=["diving", "snorkelling", "kayaki
     except Exception as e:
       return response.text, "FAILED"
 
-    final_location = final_response[-1]['area']
+    final_location = final_response[-1]['district']
     for item in final_response:
       if item['type'] == 'destination':
-        prevloc.add(item['area'] + " " + item['activities'])
+        prevloc.add(item['district'] + " " + item['activities'])
 
     plans_per_day.append(final_response)