diff --git a/custom_ui/api/db/tasks.py b/custom_ui/api/db/tasks.py
index e53dd37..8bcae60 100644
--- a/custom_ui/api/db/tasks.py
+++ b/custom_ui/api/db/tasks.py
@@ -12,7 +12,7 @@ def set_task_status(task_name, new_status):
         return build_success_response(f"Task {task_name} status updated to {new_status}.")
     except Exception as e:
         return build_error_response(str(e), 500)
-    
+
 
 @frappe.whitelist()
 def get_job_task_list(job_id=""):
@@ -61,10 +61,12 @@ def get_tasks_table_data(filters={}, sortings=[], page=1, page_size=10):
             fields=["*"],
             filters=processed_filters,
             limit=page_size,
-            start=page * page_size,
+            start=(page-1) * page_size,
             order_by=processed_sortings
         )
 
+        print("TASKS?", tasks, page, page_size)
+
         tableRows = []
         for task in tasks:
             tableRow = {}
diff --git a/frontend/src/components/pages/Tasks.vue b/frontend/src/components/pages/Tasks.vue
index 1e9515e..0e7a9ec 100644
--- a/frontend/src/components/pages/Tasks.vue
+++ b/frontend/src/components/pages/Tasks.vue
@@ -21,18 +21,22 @@
 <script setup>
 import DataTable from "../common/DataTable.vue";
 import { ref, onMounted, watch, computed } from "vue";
-import { useRouter } from "vue-router";
+import { useRouter, useRoute } from "vue-router";
 import Api from "../../api";
 import { useLoadingStore } from "../../stores/loading";
 import { usePaginationStore } from "../../stores/pagination";
 import { useFiltersStore } from "../../stores/filters";
 import { useNotificationStore } from "../../stores/notifications-primevue";
+import { FilterMatchMode } from "@primevue/core";
 
 const loadingStore = useLoadingStore();
 const paginationStore = usePaginationStore();
 const filtersStore = useFiltersStore();
 const notifications = useNotificationStore();
 
+const route = useRoute();
+const subject = route.query.subject;
+
 const tableData = ref([]);
 const totalRecords = ref(0);
 const isLoading = ref(false);
@@ -46,13 +50,18 @@ const statusOptions = ref([
 	"Cancelled",
 ]);
 
+const filters = {
+	subject: { value: null, matchMode: FilterMatchMode.CONTAINS },
+};
+
 // Computed property to get current filters for the chart
 const currentFilters = computed(() => {
 	return filtersStore.getTableFilters("tasks");
 });
 
 const columns = [
-	{ label: "Task", fieldName: "subject", type: "text", sortable: true, filterable: true },
+	{ label: "Task", fieldName: "subject", type: "text", sortable: true, filterable: true,
+	filterInputID: "subjectFilterId" },
 	{ label: "Job", fieldName: "project", type: "link", sortable: true,
 		onLinkClick: (link, rowData) => handleProjectClick(link, rowData)
 	},
@@ -92,7 +101,7 @@ const tableActions = [
 				try {
 					// Uncomment when API is ready
 					await Api.setTaskStatus(rowData.id, option);
-					
+
 					// Find and update the row in the table data
 					const rowIndex = tableData.value.findIndex(row => row.id === rowData.id);
 					if (rowIndex >= 0) {
@@ -211,6 +220,10 @@ watch(showCompleted, () => {
 
 // Load initial data
 onMounted(async () => {
+	if (subject) {
+		const inputElement = document.getElementById(`filter-subject`);
+		inputElement.text = subject;
+	}
 	notifications.addWarning("Tasks page coming soon");
 	// Initialize pagination and filters
 	paginationStore.initializeTablePagination("tasks", { rows: 10 });
@@ -222,6 +235,14 @@ onMounted(async () => {
 	const initialFilters = filtersStore.getTableFilters("tasks");
 	const initialSorting = filtersStore.getTableSorting("tasks");
 
+	if (subject) {
+		console.log(subject);
+		console.log(initialFilters);
+		console.log(initialFilters.subject);
+		initialFilters.subject.value = subject;
+		//initialFilters = {...initialFilters, subject: {value: subject, match_mode: "contains"}};
+	}
+
 	const optionsResult = await Api.getTaskStatusOptions();
 	statusOptions.value = optionsResult;
 	console.log("DEBUG: Loaded Status options: ", statusOptions.value)