diff --git a/docker-compose.yml b/docker-compose.yml
index c758944ee..690fd4343 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -282,7 +282,7 @@ services:
       # AUTH_JWT_KEY: ${ENCRYPTION_KEY}
       # AUTH_JWT_AUD: ${FMTM_DOMAIN}
     ports:
-      - "7055:7055"
+      - "7055:3000"
     networks:
       - fmtm-net
     restart: "unless-stopped"
diff --git a/src/backend/app/db/models.py b/src/backend/app/db/models.py
index 6ef90816b..527397444 100644
--- a/src/backend/app/db/models.py
+++ b/src/backend/app/db/models.py
@@ -41,6 +41,7 @@
 from app.db.enums import (
     BackgroundTaskStatus,
     CommunityType,
+    EntityState,
     HTTPStatus,
     MappingLevel,
     MappingState,
@@ -842,7 +843,7 @@ async def create(
 
         Args:
             db (Connection): The database connection.
-            project_id (int): The organisation ID.
+            project_id (int): The project ID.
             tasks (geojson.FeatureCollection): FeatureCollection of task areas.
 
         Returns:
@@ -1296,6 +1297,79 @@ async def delete(cls, db: Connection, project_id: int) -> bool:
             )
 
 
+class DbOdkEntities(BaseModel):
+    """Table odk_entities.
+
+    Mirror tracking the status of Entities in ODK.
+    """
+
+    entity_id: UUID
+    status: EntityState
+    project_id: int
+    task_id: int
+
+    @classmethod
+    async def upsert(
+        cls,
+        db: Connection,
+        project_id: int,
+        entities: list[Self],
+    ) -> bool:
+        """Update or insert Entity data, with statuses.
+
+        Args:
+            db (Connection): The database connection.
+            project_id (int): The project ID.
+            entities (list[Self]): List of DbOdkEntities objects.
+
+        Returns:
+            bool: Success or failure.
+        """
+        log.info(
+            f"Updating FMTM database Entities for project {project_id} "
+            f"with ({len(entities)}) features"
+        )
+
+        sql = """
+            INSERT INTO public.odk_entities
+                (entity_id, status, project_id, task_id)
+            VALUES
+        """
+
+        # Prepare data for bulk insert
+        values = []
+        data = {}
+        for index, entity in enumerate(entities):
+            entity_index = f"entity_{index}"
+            values.append(
+                f"(%({entity_index}_entity_id)s, "
+                f"%({entity_index}_status)s, "
+                f"%({entity_index}_project_id)s, "
+                f"%({entity_index}_task_id)s)"
+            )
+            data[f"{entity_index}_entity_id"] = entity["id"]
+            data[f"{entity_index}_status"] = EntityState(int(entity["status"])).name
+            data[f"{entity_index}_project_id"] = project_id
+            task_id = entity["task_id"]
+            data[f"{entity_index}_task_id"] = int(task_id) if task_id else None
+
+        sql += (
+            ", ".join(values)
+            + """
+            ON CONFLICT (entity_id) DO UPDATE SET
+                status = EXCLUDED.status,
+                task_id = EXCLUDED.task_id
+            RETURNING True;
+        """
+        )
+
+        async with db.cursor() as cur:
+            await cur.execute(sql, data)
+            result = await cur.fetchall()
+
+        return bool(result)
+
+
 class DbBackgroundTask(BaseModel):
     """Table background_tasks.
 
diff --git a/src/backend/app/projects/project_crud.py b/src/backend/app/projects/project_crud.py
index 254cb1982..c33425319 100644
--- a/src/backend/app/projects/project_crud.py
+++ b/src/backend/app/projects/project_crud.py
@@ -532,8 +532,8 @@ async def generate_project_files(
 
     # Split extract by task area
     log.debug("Splitting data extract per task area")
-    # TODO in future this splitting could be removed as the task_id is
-    # no longer used in the XLSForm
+    # TODO in future this splitting could be removed if the task_id is
+    # no longer used in the XLSForm for the map filter
     task_extract_dict = await split_geojson_by_task_areas(
         db, feature_collection, project_id
     )
diff --git a/src/backend/app/projects/project_routes.py b/src/backend/app/projects/project_routes.py
index 9e16d025d..6873a37e0 100644
--- a/src/backend/app/projects/project_routes.py
+++ b/src/backend/app/projects/project_routes.py
@@ -57,7 +57,14 @@
     ProjectRole,
     XLSFormType,
 )
-from app.db.models import DbBackgroundTask, DbBasemap, DbProject, DbTask, DbUserRole
+from app.db.models import (
+    DbBackgroundTask,
+    DbBasemap,
+    DbOdkEntities,
+    DbProject,
+    DbTask,
+    DbUserRole,
+)
 from app.db.postgis_utils import (
     check_crs,
     featcol_keep_single_geom_type,
@@ -174,14 +181,20 @@ async def get_odk_entities_geojson(
     response_model=list[central_schemas.EntityMappingStatus],
 )
 async def get_odk_entities_mapping_statuses(
+    project_id: int,
     project: Annotated[DbProject, Depends(project_deps.get_project)],
     db: Annotated[Connection, Depends(db_conn)],
 ):
     """Get the ODK entities mapping statuses, i.e. in progress or complete."""
-    return await central_crud.get_entities_data(
+    entities = await central_crud.get_entities_data(
         project.odk_credentials,
         project.odkid,
     )
+    # First update the Entity statuses in the db
+    # FIXME this is a hack and in the long run should be replaced
+    # https://github.com/hotosm/fmtm/issues/1841
+    await DbOdkEntities.upsert(db, project_id, entities)
+    return entities
 
 
 @router.get(
diff --git a/src/backend/migrations/009-entity-table.sql b/src/backend/migrations/009-entity-table.sql
new file mode 100644
index 000000000..8d893d2d9
--- /dev/null
+++ b/src/backend/migrations/009-entity-table.sql
@@ -0,0 +1,36 @@
+-- ## Migration to:
+-- * Add a new table that syncs the ODK Entity status to FMTM.
+-- * Add a primary key for entity_id field.
+-- * Add two indexes on entity_id + project_id / task_id
+
+
+-- Start a transaction
+BEGIN;
+
+CREATE TABLE IF NOT EXISTS public.odk_entities (
+    entity_id UUID NOT NULL,
+    status entitystate NOT NULL,
+    project_id integer NOT NULL,
+    task_id integer
+);
+ALTER TABLE public.odk_entities OWNER TO fmtm;
+
+DO $$
+BEGIN
+    IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'odk_entities_pkey') THEN
+        ALTER TABLE ONLY public.odk_entities
+        ADD CONSTRAINT odk_entities_pkey PRIMARY KEY (entity_id);
+    END IF;
+END $$;
+
+CREATE INDEX IF NOT EXISTS idx_entities_project_id
+ON public.odk_entities USING btree (
+    entity_id, project_id
+);
+CREATE INDEX IF NOT EXISTS idx_entities_task_id
+ON public.odk_entities USING btree (
+    entity_id, task_id
+);
+
+-- Commit the transaction
+COMMIT;
diff --git a/src/backend/migrations/init/fmtm_base_schema.sql b/src/backend/migrations/init/fmtm_base_schema.sql
index e295b56ee..d37230eac 100644
--- a/src/backend/migrations/init/fmtm_base_schema.sql
+++ b/src/backend/migrations/init/fmtm_base_schema.sql
@@ -160,7 +160,7 @@ SET default_table_access_method = heap;
 
 -- Tables
 
-CREATE TABLE IF NOT EXISTS public._migrations (
+CREATE TABLE public._migrations (
     script_name text,
     date_executed timestamp with time zone
 );
@@ -339,6 +339,14 @@ CREATE TABLE public.users (
 );
 ALTER TABLE public.users OWNER TO fmtm;
 
+CREATE TABLE public.odk_entities (
+    entity_id UUID NOT NULL,
+    status entitystate NOT NULL,
+    project_id integer NOT NULL,
+    task_id integer
+);
+ALTER TABLE public.odk_entities OWNER TO fmtm;
+
 CREATE TABLE public.xlsforms (
     id integer NOT NULL,
     title character varying,
@@ -435,6 +443,9 @@ ADD CONSTRAINT users_pkey PRIMARY KEY (id);
 ALTER TABLE ONLY public.users
 ADD CONSTRAINT users_username_key UNIQUE (username);
 
+ALTER TABLE ONLY public.odk_entities
+ADD CONSTRAINT odk_entities_pkey PRIMARY KEY (entity_id);
+
 ALTER TABLE ONLY public.xlsforms
 ADD CONSTRAINT xlsforms_pkey PRIMARY KEY (id);
 
@@ -447,16 +458,16 @@ ADD CONSTRAINT submission_photos_pkey PRIMARY KEY (id);
 -- Indexing
 
 CREATE INDEX idx_projects_outline ON public.projects USING gist (outline);
-CREATE INDEX IF NOT EXISTS idx_projects_mapper_level
+CREATE INDEX idx_projects_mapper_level
 ON public.projects USING btree (
     mapper_level
 );
-CREATE INDEX IF NOT EXISTS idx_projects_organisation_id
+CREATE INDEX idx_projects_organisation_id
 ON public.projects USING btree (
     organisation_id
 );
 CREATE INDEX idx_tasks_outline ON public.tasks USING gist (outline);
-CREATE INDEX IF NOT EXISTS idx_tasks_composite
+CREATE INDEX idx_tasks_composite
 ON public.tasks USING btree (
     id, project_id
 );
@@ -466,26 +477,34 @@ CREATE INDEX idx_user_roles ON public.user_roles USING btree (
 CREATE INDEX idx_org_managers ON public.organisation_managers USING btree (
     user_id, organisation_id
 );
-CREATE INDEX IF NOT EXISTS idx_task_event_composite
+CREATE INDEX idx_task_event_composite
 ON public.task_events USING btree (
     task_id, project_id
 );
-CREATE INDEX IF NOT EXISTS idx_task_event_project_user
+CREATE INDEX idx_task_event_project_user
 ON public.task_events USING btree (
     user_id, project_id
 );
-CREATE INDEX IF NOT EXISTS idx_task_event_project_id
+CREATE INDEX idx_task_event_project_id
 ON public.task_events USING btree (
     task_id, project_id
 );
-CREATE INDEX IF NOT EXISTS idx_task_event_user_id
+CREATE INDEX idx_task_event_user_id
 ON public.task_events USING btree (
     task_id, user_id
 );
-CREATE INDEX IF NOT EXISTS idx_task_history_date
+CREATE INDEX idx_task_history_date
 ON public.task_history USING btree (
     task_id, created_at
 );
+CREATE INDEX idx_entities_project_id
+ON public.odk_entities USING btree (
+    entity_id, project_id
+);
+CREATE INDEX idx_entities_task_id
+ON public.odk_entities USING btree (
+    entity_id, task_id
+);
 
 -- Foreign keys
 
diff --git a/src/mapper/src/lib/components/page/layer-switcher.svelte b/src/mapper/src/lib/components/page/layer-switcher.svelte
index 22a15c412..570d93376 100644
--- a/src/mapper/src/lib/components/page/layer-switcher.svelte
+++ b/src/mapper/src/lib/components/page/layer-switcher.svelte
@@ -1,5 +1,5 @@
 <script>
-	import { clickOutside } from '../../../utilFunctions/clickOutside.ts';
+	import { clickOutside } from '$lib/utils/clickOutside.ts';
 
 	let isOpen = false;
 </script>
diff --git a/src/mapper/src/lib/components/page/legend.svelte b/src/mapper/src/lib/components/page/legend.svelte
index 91ca4a235..8a495875d 100644
--- a/src/mapper/src/lib/components/page/legend.svelte
+++ b/src/mapper/src/lib/components/page/legend.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-	import { clickOutside } from '../../../utilFunctions/clickOutside.ts';
-	import LockImg from '../../../assets/images/black-lock.png';
-	import '../../../styles/page.css';
+	import { clickOutside } from '$lib/utils/clickOutside.ts';
+	import LockImg from '$assets/images/black-lock.png';
+	import '$styles/page.css';
 
 	type taskStatusesType = { status: string; color?: string; icon?: string };
 
diff --git a/src/mapper/src/lib/task-events.ts b/src/mapper/src/lib/task-events.ts
index 6f42a38e4..9985570f2 100644
--- a/src/mapper/src/lib/task-events.ts
+++ b/src/mapper/src/lib/task-events.ts
@@ -1,50 +1,31 @@
 import { v4 as uuidv4 } from 'uuid';
-import { TaskStatusEnum } from '$lib/types';
-import type { MappingState, TaskEvent } from '$lib/types';
+import { TaskEventEnum } from '$lib/types';
+import type { TaskEvent, TaskEventResponse, NewEvent } from '$lib/types';
 
 const API_URL = import.meta.env.VITE_API_URL;
 
-export function statusEnumLabelToValue(statusLabel: string): string {
-	console.log(statusLabel);
-	// Check if the statusLabel exists in TaskStatusEnum
-	if (!(statusLabel in TaskStatusEnum)) {
-		throw new Error(`Invalid status string: ${statusLabel}`);
-	}
-	const statusValue = TaskStatusEnum[statusLabel as keyof MappingState];
-
-	return statusValue;
-}
-
-export function statusEnumValueToLabel(statusValue: string): keyof MappingState {
-	// Validate if statusValue exists in TaskStatusEnum
-	const statusEntry = Object.entries(TaskStatusEnum).find(([_, value]) => value === statusValue);
-
-	if (statusEntry) {
-		return statusEntry[0] as keyof MappingState;
-	} else {
-		throw new Error(`Invalid status value: ${statusValue}`);
-	}
-}
-
-// // interface NewEvent {
-// //   project_id: number;
-// //   task_id: number;
-// //   user_id: number;
-// // }
-
 async function add_event(
 	// db,
 	projectId: number,
 	taskId: number,
 	// userId: number,
-	actionId: string,
+	eventType: TaskEvent,
 	// comment: string = '',
 	// ): Promise<void> {
-): Promise<TaskEvent | false> {
+): Promise<TaskEventResponse | false> {
 	// const eventId = uuidv4()
-	const resp = await fetch(`${API_URL}/tasks/${taskId}/new-status/${actionId}?project_id=${projectId}`, {
+	const newEvent: NewEvent = {
+		event_id: uuidv4(),
+		event: eventType,
+		task_id: taskId,
+	};
+	const resp = await fetch(`${API_URL}/tasks/${taskId}/event/?project_id=${projectId}`, {
 		method: 'POST',
 		credentials: 'include',
+		headers: {
+			'Content-Type': 'application/json',
+		},
+		body: JSON.stringify(newEvent),
 	});
 
 	if (resp.status !== 200) {
@@ -52,8 +33,8 @@ async function add_event(
 		return false;
 	}
 
-	const newEvent = await resp.json();
-	return newEvent;
+	const response = await resp.json();
+	return response;
 
 	// // Uncomment this for local first approach
 	// await db.task_events.create({
@@ -70,19 +51,15 @@ async function add_event(
 }
 
 export async function mapTask(/* db, */ projectId: number, taskId: number): Promise<void> {
-	await add_event(/* db, */ projectId, taskId, TaskStatusEnum.LOCKED_FOR_MAPPING);
+	await add_event(/* db, */ projectId, taskId, TaskEventEnum.MAP);
 }
 
 export async function finishTask(/* db, */ projectId: number, taskId: number): Promise<void> {
-	// TODO the backend /new-status endpoint is actually posting MappingState
-	// TODO it should likely be posting TaskEvent (TaskEvent) to the endpoint
-	// TODO then we handle the status of the task internally
-	// i.e. it's duplicated info!
-	await add_event(/* db, */ projectId, taskId, TaskStatusEnum.UNLOCKED_TO_VALIDATE);
+	await add_event(/* db, */ projectId, taskId, TaskEventEnum.FINISH);
 }
 
 export async function resetTask(/* db, */ projectId: number, taskId: number): Promise<void> {
-	await add_event(/* db, */ projectId, taskId, TaskStatusEnum.UNLOCKED_TO_MAP);
+	await add_event(/* db, */ projectId, taskId, TaskEventEnum.BAD);
 }
 
 // async function finishTask(db, projectId: number, taskId: number, userId: number): Promise<void> {
diff --git a/src/mapper/src/lib/types.ts b/src/mapper/src/lib/types.ts
index 5c876f547..72609f527 100644
--- a/src/mapper/src/lib/types.ts
+++ b/src/mapper/src/lib/types.ts
@@ -1,3 +1,5 @@
+import type { UUID } from 'crypto';
+
 export type ProjectTask = {
 	id: number;
 	project_id: number;
@@ -74,12 +76,39 @@ export const TaskStatusEnum: TaskStatus = Object.freeze({
 	UNLOCKED_DONE: 'UNLOCKED_DONE',
 });
 
-// TODO fix me
 export type TaskEvent = {
+	MAP: string;
+	FINISH: string;
+	VALIDATE: string;
+	GOOD: string;
+	BAD: string;
+	// SPLIT: string;
+	// MERGE: string;
+	// ASSIGN: string;
+	// COMMENT: string;
+};
+export const TaskEventEnum: TaskEvent = Object.freeze({
+	MAP: 'MAP',
+	FINISH: 'FINISH',
+	VALIDATE: 'VALIDATE',
+	GOOD: 'GOOD',
+	BAD: 'BAD',
+});
+
+export type TaskEventResponse = {
 	event_id: string;
+	event: TaskEvent;
+	task_id: number;
 	comment: string;
 	created_at: string;
 	username: string;
 	profile_img: string;
 	status: TaskStatus;
 };
+
+export type NewEvent = {
+	event_id: UUID;
+	event: TaskEvent;
+	task_id: number;
+	comment?: string | null;
+};
diff --git a/src/mapper/src/utilFunctions/clickOutside.ts b/src/mapper/src/lib/utils/clickOutside.ts
similarity index 100%
rename from src/mapper/src/utilFunctions/clickOutside.ts
rename to src/mapper/src/lib/utils/clickOutside.ts
diff --git a/src/mapper/src/utilFunctions/getDeviceRotation.ts b/src/mapper/src/lib/utils/getDeviceRotation.ts
similarity index 100%
rename from src/mapper/src/utilFunctions/getDeviceRotation.ts
rename to src/mapper/src/lib/utils/getDeviceRotation.ts
diff --git a/src/mapper/src/routes/[projectId]/+page.svelte b/src/mapper/src/routes/[projectId]/+page.svelte
index 09105901f..03a3883c8 100644
--- a/src/mapper/src/routes/[projectId]/+page.svelte
+++ b/src/mapper/src/routes/[projectId]/+page.svelte
@@ -24,7 +24,6 @@
 	import { bbox } from '@turf/bbox';
 
 	import type { ProjectData, ProjectTask, ZoomToTaskEventDetail } from '$lib/types';
-	import { statusEnumLabelToValue, statusEnumValueToLabel } from '$lib/task-events';
 	import {
 		mapTask,
 		finishTask,
@@ -45,7 +44,7 @@
 	import RedLockImg from '$assets/images/red-lock.png';
 	import More from '$lib/components/page/more/index.svelte';
 	import '$styles/button.css';
-	import { GetDeviceRotation } from '$utilFunctions/getDeviceRotation';
+	import { GetDeviceRotation } from '$lib/utils/getDeviceRotation';
 	import LocationArcImg from '$assets/images/locationArc.png';
 	import LocationDotImg from '$assets/images/locationDot.png';
 	import { setAlert } from '$store/common';
@@ -68,6 +67,7 @@
 		url: 'http://localhost:7055/v1/shape/task_events',
 		where: `project_id=${data.projectId}`,
 	});
+
 	const taskHistoryEvents = new Shape(taskHistoryStream);
 	const taskEventArray = writable([]);
 	const latestEvent = writable();
@@ -75,37 +75,40 @@
 		updateTaskFeatures();
 	}
 
-	async function getLatestEventForTasks() {
+	async function getLatestStatePerTask() {
 		const taskEventMap = await taskHistoryEvents.value;
 		const taskEventArrayFromApi = Array.from(taskEventMap.values());
 
 		// Update the taskEventArray writable store
 		taskEventArray.set(taskEventArrayFromApi);
 
-		const latestActions = new Map();
+		const currentTaskStates = new Map();
 
 		for (const taskData of taskEventArrayFromApi) {
-			// Use the task_id as the key and action as the value
-			latestActions.set(taskData.task_id, taskData.event);
+			// Use the task_id as the key and state as the value
+			currentTaskStates.set(taskData.task_id, {
+				state: taskData.state || 'UNLOCKED_TO_MAP',
+				actioned_by_uid: taskData.user_id || null,
+			});
 		}
 
-		return latestActions;
+		return currentTaskStates;
 	}
 
 	async function updateTaskFeatures() {
-		const latestActions = await getLatestEventForTasks();
+		const latestTaskStates = await getLatestStatePerTask();
 
 		const features = data.project.tasks.map((x: ProjectTask) => {
-			const taskId = x.outline.id;
-			const statusString = latestActions.get(taskId);
-			const status = statusString ? statusEnumLabelToValue(statusString) : '0';
-
+			const taskId = x.id;
+			const taskDetails = latestTaskStates.get(taskId) || {
+				state: 'UNLOCKED_TO_MAP',
+				actioned_by_uid: null,
+			};
 			return {
-				...x.outline,
-				properties: {
-					...x.outline.properties,
-					status,
-				},
+				type: 'Feature',
+				id: taskId,
+				geometry: x.outline,
+				properties: taskDetails
 			};
 		});
 
@@ -121,18 +124,18 @@
 	let selectedTaskId = writable<number | null>(null);
 	let featureClicked = writable(false);
 	let selectedTask = writable<any>(null);
-	let selectedTaskStatus = writable<string>('');
+	let selectedTaskState = writable<string>('');
 
 	$: selectedTask.set(data.project.tasks.find((task: ProjectTask) => task.id === $selectedTaskId));
 
 	$: (async () => {
 		const task = $selectedTask;
 		if (task && task.id) {
-			const latestActions = await getLatestEventForTasks();
-			const statusLabel = latestActions.get(task.id);
-			selectedTaskStatus.set(statusLabel ? statusLabel : 'UNLOCKED_TO_MAP');
+			const latestTaskStates = await getLatestStatePerTask();
+			const latestTaskDetails = latestTaskStates.get(task.id);
+			selectedTaskState.set(latestTaskDetails?.state || 'UNLOCKED_TO_MAP');
 		} else {
-			selectedTaskStatus.set('');
+			selectedTaskState.set('');
 		}
 	})();
 
@@ -298,7 +301,7 @@
 {/if}
 
 {#if $selectedTaskId}
-	{#if $selectedTaskStatus == 'UNLOCKED_TO_MAP'}
+	{#if $selectedTaskState == 'UNLOCKED_TO_MAP'}
 		<sl-tooltip content="MAP">
 			<hot-icon-button
 				name="play"
@@ -307,7 +310,7 @@
 				on:click={mapTask(data.projectId, $selectedTaskId)}
 			></hot-icon-button>
 		</sl-tooltip>
-	{:else if $selectedTaskStatus == 'LOCKED_FOR_MAPPING'}
+	{:else if $selectedTaskState == 'LOCKED_FOR_MAPPING'}
 		<sl-tooltip content="FINISH">
 			<hot-icon-button
 				name="stop"
@@ -316,7 +319,7 @@
 				on:click={finishTask(data.projectId, $selectedTaskId)}
 			></hot-icon-button>
 		</sl-tooltip>
-	{:else if $selectedTaskStatus == 'UNLOCKED_TO_VALIDATE'}
+	{:else if $selectedTaskState == 'UNLOCKED_TO_VALIDATE'}
 		<sl-tooltip content="RESET">
 			<hot-icon-button
 				name="arrow-counterclockwise"
@@ -347,8 +350,8 @@
 			});
 		}}
 		images={[
-			{ id: '1', url: BlackLockImg },
-			{ id: '3', url: RedLockImg },
+			{ id: 'LOCKED_FOR_MAPPING', url: BlackLockImg },
+			{ id: 'LOCKED_FOR_VALIDATION', url: RedLockImg },
 			{ id: 'locationArc', url: LocationArcImg },
 			{ id: 'locationDot', url: LocationDotImg },
 		]}
@@ -390,19 +393,17 @@
 				paint={{
 					'fill-color': [
 						'match',
-						['get', 'status'],
-						'0',
+						['get', 'state'],
+						'UNLOCKED_TO_MAP',
 						'#ffffff',
-						'1',
+						'LOCKED_FOR_MAPPING',
 						'#008099',
-						'2',
+						'UNLOCKED_TO_VALIDATE',
 						'#ade6ef',
-						'3',
+						'LOCKED_FOR_VALIDATION',
 						'#fceca4',
-						'4',
+						'UNLOCKED_DONE',
 						'#40ac8c',
-						'5',
-						'#d73f3e',
 						'#c5fbf5', // default color if no match is found
 					],
 					'fill-opacity': hoverStateFilter(0.5, 0),
@@ -430,7 +431,9 @@
 				applyToClusters={false}
 				hoverCursor="pointer"
 				layout={{
-					'icon-image': ['case', ['==', ['get', 'status'], '1'], '1', ['==', ['get', 'status'], '3'], '3', ''],
+					'icon-image': ['case', 
+					['==', ['get', 'state'], 'LOCKED_FOR_MAPPING'], 'LOCKED_FOR_MAPPING', 
+					 ['==', ['get', 'status'],'LOCKED_FOR_VALIDATION'], 'LOCKED_FOR_VALIDATION', ''],
 					'icon-allow-overlap': true,
 				}}
 			/>
@@ -441,7 +444,7 @@
 		</div>
 	</MapLibre>
 
-	{#if $selectedTaskId && selectedTab === 'map' && toggleTaskActionModal && ($selectedTaskStatus === 'UNLOCKED_TO_MAP' || $selectedTaskStatus === 'LOCKED_FOR_MAPPING')}
+	{#if $selectedTaskId && selectedTab === 'map' && toggleTaskActionModal && ($selectedTaskState === 'UNLOCKED_TO_MAP' || $selectedTaskState === 'LOCKED_FOR_MAPPING')}
 		<div class="flex justify-center !w-[100vw] absolute bottom-[4rem] left-0 pointer-events-none z-50">
 			<div
 				class="bg-white w-[100vw] h-fit font-barlow-regular w-[100vw] md:max-w-[580px] pointer-events-auto px-4 pb-3 sm:pb-4 rounded-t-3xl"
@@ -455,7 +458,7 @@
 					></hot-icon>
 				</div>
 
-				{#if $selectedTaskStatus == 'UNLOCKED_TO_MAP'}
+				{#if $selectedTaskState == 'UNLOCKED_TO_MAP'}
 					<p class="my-4 sm:my-6">Do you want to start mapping task #{$selectedTaskId}?</p>
 					<div class="flex justify-center gap-x-2">
 						<sl-button
@@ -477,7 +480,7 @@
 							</div>
 						</sl-button>
 					</div>
-				{:else if $selectedTaskStatus == 'LOCKED_FOR_MAPPING'}
+				{:else if $selectedTaskState == 'LOCKED_FOR_MAPPING'}
 					<p class="my-4 sm:my-6">Task #{$selectedTaskId} has been locked, Is the task completely mapped?</p>
 					<div class="grid grid-cols-2 sm:grid-cols-3 gap-2">
 						<sl-button
diff --git a/src/mapper/svelte.config.js b/src/mapper/svelte.config.js
index 5911b4455..7aba0edcc 100644
--- a/src/mapper/svelte.config.js
+++ b/src/mapper/svelte.config.js
@@ -27,8 +27,12 @@ const config = {
 	},
 
 	alias: {
+		$lib: 'src/lib',
 		$components: 'src/components',
 		$static: 'static',
+		$store: 'src/store',
+		$styles: 'styles',
+		$assets: 'assets',
 	},
 };
 
diff --git a/src/mapper/vite.config.ts b/src/mapper/vite.config.ts
index 9cef7c140..05d935c78 100644
--- a/src/mapper/vite.config.ts
+++ b/src/mapper/vite.config.ts
@@ -26,7 +26,6 @@ export default defineConfig({
 			$store: path.resolve('./src/store'),
 			$styles: path.resolve('./src/styles'),
 			$assets: path.resolve('./src/assets'),
-			$utilFunctions: path.resolve('./src/utilFunctions'),
 		},
 	},
 	test: {