diff --git a/app/src/plugins/tm@dashboard/_components/z-timeline.vue b/app/src/plugins/tm@dashboard/_components/z-timeline.vue
index 778b451..aef6302 100644
--- a/app/src/plugins/tm@dashboard/_components/z-timeline.vue
+++ b/app/src/plugins/tm@dashboard/_components/z-timeline.vue
@@ -73,7 +73,7 @@
 				</div>
 
 				<div v-else-if="['subtask', 'blocker', 'adhoc', 'vacation', 'free_day'].includes(event.type)" class="custom-event-body colWidth h-100 d-flex flex-column justify-space-between" :class="{'short-event' : getEventLength(event) <= 9000000, 'mini-event' : getEventLength(event) <= 5400000, 'micro-event' : getEventLength(event) <= 3600000, 'not-approved': !event.blocker?.approved && event.isBlocker }" :style="{backgroundColor: event._timeblock_is_finished || event.subtask?.is_finished ? '#dedfe0' : event.color || event.subtask?.color}">
-					<div class="event-content" :class="{'is-blocker': event.isBlocker}"> 
+					<div class="event-content" :class="{'is-blocker': event.isBlocker}">
 						<template v-if="event.type == 'subtask'">
 							<small v-if="event.subtask.project_code" class="project-code">{{ event.subtask.project_code }}</small>
 							<h3>{{ event.subtask.title ?? event.subtask.master_task?.name ?? event.subtask.master_task }}</h3>
@@ -88,7 +88,7 @@
 								</template>
 							</v-tooltip>
 						</template>
-						
+
 						<div class="d-flex align-center event-details event-initials-wrapper">
 							<div class="event-initials d-flex justify-center align-center">
 								<small>{{ event.initials }}</small>
@@ -202,6 +202,7 @@ export default {
 		},
 
 		getDeadline(subtask) {
+			// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
 			if (subtask?.deadline)
 				return subtask.deadline
 
@@ -222,7 +223,7 @@ export default {
 			const start = date.setHours(Math.round(event.startTimeMinutes / 60), Math.round(event.startTimeMinutes % 60), 0)
 			const end 	= date.setHours(Math.round(event.endTimeMinutes / 60), Math.round(event.endTimeMinutes % 60), 0)
 			const split = this.splits.find(split => split.id == newSplit )
-			
+
 			if(this.$route.name == 'Dashboard - Tasks') {
 				const editedSubtask = {
 					...event.subtask,
@@ -343,7 +344,7 @@ export default {
 				subtask.timeblocks = subtask.timeblocks.map(originalTimeblock => {
 					if (originalTimeblock.id == newTimeblock.id)
 						return newTimeblock
-					
+
 					return originalTimeblock
 				})
 
diff --git a/app/src/plugins/tm@dashboard/projects/projects.vue b/app/src/plugins/tm@dashboard/projects/projects.vue
index d393c52..fb4a055 100644
--- a/app/src/plugins/tm@dashboard/projects/projects.vue
+++ b/app/src/plugins/tm@dashboard/projects/projects.vue
@@ -1,7 +1,7 @@
 <template>
 	<div ref="page">
 		<A-project-filter v-if="$store.getters['tm/isInitialized']" @filterChanged="onFilterChanged" />
-		
+
 		<W-loadable class="non-projects" :content="filteredProjects" emptyMessage="Nenašli sa žiadne vyhovujúce projekty">
 			<A-project-calendar :events="filteredProjects" :month="filter.month" @open-detail="openMasterTaskModal" />
 		</W-loadable>
@@ -15,12 +15,12 @@ import FilterMixin		from '../_mixins/Filter.mixin'
 
 export default {
 	mixins: [FilterMixin],
-	
+
 	components: {
 		AProjectCalendar,
 		AProjectFilter
 	},
-	
+
 	data() {
 		return {
 			mastertasks: null,
@@ -30,18 +30,19 @@ export default {
 
 	computed: {
 		filteredProjects() {
+			// FIX: KRAVARIK pozriet co sa robi tunak, a ci staci vytiahnut mastertasky z BE podla date range
 			if (!this.mastertasks)
 				return null
-			
+
 				// return this.mastertasks.map(event => {
-					
+
 				// 	const startOfDay = new Date(event.starts_at);
 				// 	startOfDay.setHours(0, 0, 0, 0); // Set to 00:00:00.000
 
 				// 	const endOfDay = new Date(event.deadline);
 				// 	endOfDay.setHours(23, 59, 59, 999); // Set to 23:59:59.999
 
-				// 	console.log({ 
+				// 	console.log({
 				// 		start: startOfDay,
 				// 		end: endOfDay,
 				// 	})
@@ -123,6 +124,7 @@ export default {
 		},
 
 		openMasterTaskModal(mastertaskId) {
+			// FIX: Request na BE pre mastertasks/{id}
 			const mastertask = this.mastertasks.find(mastertask => mastertask.id == mastertaskId)
 			this.$events.emit('show-mastertask-modal', {mastertask, editMode: false})
 		}
diff --git a/app/src/plugins/tm@modal/task/_components/_components/a-task-deadline.vue b/app/src/plugins/tm@modal/task/_components/_components/a-task-deadline.vue
index 8e37e18..42bbe5d 100644
--- a/app/src/plugins/tm@modal/task/_components/_components/a-task-deadline.vue
+++ b/app/src/plugins/tm@modal/task/_components/_components/a-task-deadline.vue
@@ -10,7 +10,7 @@
 		</v-col>
 		<v-col cols="7">
 			<v-sheet class="py-3">
-				<p v-if="subtask.deadline" :class="`${tmUtils.isAfter(subtask.deadline) ? 'text-black' : 'text-red-darken-4'}`">{{ tmUtils.formatDate(subtask.deadline) }} {{ deadlineTime }}</p> 
+				<p v-if="subtask.deadline" :class="`${tmUtils.isAfter(subtask.deadline) ? 'text-black' : 'text-red-darken-4'}`">{{ tmUtils.formatDate(subtask.deadline) }} {{ deadlineTime }}</p>
 				<v-tooltip v-else text="Deadline z Mastertasku" location="end">
 					<template v-slot:activator="{ props }">
 						<span class="cursor-pointer" v-bind="props">{{ getMasterTaskDeadline(subtask) }}*</span>
@@ -53,6 +53,7 @@ export default {
 
 	methods: {
 		getMasterTaskDeadline(subtask) {
+			// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
 			if(!this.mastertasks) return ''
 			const masterTask = this.mastertasks.find((mt) => mt.id === subtask.master_task_id)
 			return tmUtils.formatDateTime(masterTask) ? tmUtils.formatDateTime(masterTask.deadline) : ''
diff --git a/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue b/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue
index accccab..dd0863d 100644
--- a/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue
+++ b/app/src/plugins/tm@modal/task/_components/_components/a-task-timeblocks.vue
@@ -110,7 +110,7 @@ export default {
 
 	validations() {
 		return {
-			form: { 
+			form: {
 				date: { required },
 				starts_at_time: { required },
 				ends_at_time: { required }
@@ -202,7 +202,7 @@ export default {
 				subtask.timeblocks = subtask.timeblocks.map(originalTimeblock => {
 					if (originalTimeblock.id == newTimeblock.id)
 						return newTimeblock
-					
+
 					return originalTimeblock
 				})
 
@@ -252,7 +252,7 @@ export default {
 
 			const mDate = moment(this.form.date)
 			const mDeadline = moment(deadline)
-			
+
 			const [hours, minutes] = this.form.ends_at_time.split(':').map(Number)
 
 			mDate.hours(hours)
@@ -262,6 +262,7 @@ export default {
 		},
 
 		getDeadline(subtask) {
+			// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
 			if (subtask?.deadline)
 				return subtask.deadline
 
diff --git a/app/src/plugins/tm@modal/task/z-task-modal.vue b/app/src/plugins/tm@modal/task/z-task-modal.vue
index 9f26eba..8123041 100644
--- a/app/src/plugins/tm@modal/task/z-task-modal.vue
+++ b/app/src/plugins/tm@modal/task/z-task-modal.vue
@@ -393,6 +393,7 @@ export default {
 		},
 
 		'subtask.master_task_id'(value) {
+			// FIX: Request na BE pre mastertasks/{id}
 			if (!value) return
 			this.subtask._master_task = this.mastertasks.find((mastertask) => mastertask.id == this.subtask.master_task_id)
 			this.subtask.project_code = this.subtask._master_task?.project_code || null
diff --git a/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue b/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue
index b60911b..73d2893 100644
--- a/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue
+++ b/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue
@@ -35,7 +35,7 @@
 			</tr>
 		</tbody>
 
-		
+
 	</v-table>
 </template>
 
@@ -54,7 +54,7 @@ export default {
 	computed: {
 		...mapGetters('tm', ['mastertasks'])
 	},
-	
+
 	methods: {
 		editTask(subtask, editMode = false) {
 			this.$events.emit('show-subtask-modal', {subtask, editMode})
@@ -65,6 +65,7 @@ export default {
 		},
 
 		getDeadline(subtask) {
+			// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
 			if(subtask.deadline) return moment(subtask.deadline).format('DD.MM.yyyy')
 			else if(!this.mastertasks) return ''
 			const masterTask = this.mastertasks.find((mt) => mt.id === subtask.master_task_id)
diff --git a/app/src/plugins/tm@overview/tasks-ongoing/tasks-ongoing.vue b/app/src/plugins/tm@overview/tasks-ongoing/tasks-ongoing.vue
index 2ff545d..0d3619a 100644
--- a/app/src/plugins/tm@overview/tasks-ongoing/tasks-ongoing.vue
+++ b/app/src/plugins/tm@overview/tasks-ongoing/tasks-ongoing.vue
@@ -97,6 +97,7 @@ export default {
 		},
 
 		getMasterTaskDeadline(subtask) {
+			// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
 			if(!this.mastertasks) return ''
 			const masterTask = this.mastertasks.find((mt) => mt.id === subtask.master_task_id)
 			return masterTask ? masterTask.deadline : ''
diff --git a/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue b/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue
index a303cdb..4562ae5 100644
--- a/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue
+++ b/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue
@@ -60,6 +60,7 @@ export default {
 		},
 
 		getDeadline(subtask) {
+			// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
 			if(subtask.deadline) return moment(subtask.deadline).format('DD.MM.yyyy')
 			else if(!this.mastertasks) return ''
 			const masterTask = this.mastertasks.find((mt) => mt.id === subtask.master_task_id)
diff --git a/app/src/plugins/tm@overview/tasks-unscheduled/tasks-unscheduled.vue b/app/src/plugins/tm@overview/tasks-unscheduled/tasks-unscheduled.vue
index 62e1ce1..0c3c180 100644
--- a/app/src/plugins/tm@overview/tasks-unscheduled/tasks-unscheduled.vue
+++ b/app/src/plugins/tm@overview/tasks-unscheduled/tasks-unscheduled.vue
@@ -96,6 +96,7 @@ export default {
 		},
 
 		getMasterTaskDeadline(subtask) {
+			// FIX: Subtask ma vzdy vracat aj subtask.master_task_deadline
 			if(!this.mastertasks) return ''
 			const masterTask = this.mastertasks.find((mt) => mt.id === subtask.master_task_id)
 			return masterTask ? masterTask.deadline : ''