diff --git a/html/template/sync/communication-root.html b/html/template/sync/communication-root.html
index aead22be..2ab7d26e 100644
--- a/html/template/sync/communication-root.html
+++ b/html/template/sync/communication-root.html
@@ -542,6 +542,7 @@
 								<!-- Nuisance-specific Fields -->
 								<template
 									x-if="selectedCommunication.type === 'publicreport.nuisance'"
+									x-data="selectedCommunication.public_report.nuisance"
 								>
 									<div class="card mb-3">
 										<div class="card-header bg-danger bg-opacity-10">
@@ -555,24 +556,16 @@
 														<i class="bi bi-clock"></i> Time of Day Encountered
 													</label>
 													<ul>
-														<template
-															x-if="selectedCommunication.public_report.nuisance.time_of_day_early"
-														>
+														<template x-if="time_of_day_early">
 															<li>Early</li>
 														</template>
-														<template
-															x-if="selectedCommunication.public_report.nuisance.time_of_day_day"
-														>
+														<template x-if="time_of_day_day">
 															<li>Daytime</li>
 														</template>
-														<template
-															x-if="selectedCommunication.public_report.nuisance.time_of_day_evening"
-														>
+														<template x-if="time_of_day_evening">
 															<li>Evening</li>
 														</template>
-														<template
-															x-if="selectedCommunication.public_report.nuisance.time_of_day_night"
-														>
+														<template x-if="time_of_day_night">
 															<li>Night</li>
 														</template>
 													</ul>
@@ -583,70 +576,52 @@
 													</label>
 													<div>
 														<ul>
-															<template
-																x-if="selectedCommunication.public_report.nuisance.is_location_backyard"
-															>
+															<template x-if="is_location_backyard">
 																<li>Backyard</li>
 															</template>
-															<template
-																x-if="selectedCommunication.public_report.nuisance.is_location_frontyard"
-															>
+															<template x-if="is_location_frontyard">
 																<li>Frontyard</li>
 															</template>
-															<template
-																x-if="selectedCommunication.public_report.nuisance.is_location_garden"
-															>
+															<template x-if="is_location_garden">
 																<li>Garden</li>
 															</template>
-															<template
-																x-if="selectedCommunication.public_report.nuisance.is_location_other"
-															>
+															<template x-if="is_location_other">
 																<li>Other</li>
 															</template>
-															<template
-																x-if="selectedCommunication.public_report.nuisance.is_location_pool"
-															>
+															<template x-if="is_location_pool">
 																<li>Pool</li>
 															</template>
 														</ul>
 													</div>
 												</div>
 												<template
-													x-if="selectedCommunication.public_report.nuisance.source_container || selectedCommunication.public_report.nuisance.source_gutter || selectedCommunication.public_report.nuisance.source_stagnant"
+													x-if="source_container || source_gutter || source_stagnant"
 												>
 													<div class="col-md-6">
 														<label class="form-label text-muted small mb-0">
 															<i class="bi bi-droplet"></i> Sources
 														</label>
 														<ul>
-															<template
-																x-if="selectedCommunication.public_report.nuisance.source_container"
-															>
+															<template x-if="source_container">
 																<li>Container</li>
 															</template>
-															<template
-																x-if="selectedCommunication.public_report.nuisance.source_gutter"
-															>
+															<template x-if="source_gutter">
 																<li>Gutter</li>
 															</template>
-															<template
-																x-if="selectedCommunication.public_report.nuisance.source_stagnant"
-															>
+															<template x-if="source_stagnant">
 																<li>Sprinklers & Gutters</li>
 															</template>
 														</ul>
 													</div>
 												</template>
-												<template
-													x-if="selectedCommunication.public_report.nuisance.source_description != ''"
-												>
+												<template x-if="source_description != ''">
 													<div class="col-12">
 														<label class="form-label text-muted small mb-0">
 															<i class="bi bi-chat-text"></i> Source Description
 														</label>
 														<div
 															class="p-2 bg-light rounded"
-															x-text="selectedCommunication.public_report.nuisance.source_description || 'none'"
+															x-text="source_description || 'none'"
 														></div>
 													</div>
 												</template>
@@ -656,7 +631,7 @@
 													</label>
 													<div
 														class="p-2 bg-light rounded"
-														x-text="selectedCommunication.public_report.nuisance.duration"
+														x-text="duration"
 													></div>
 												</div>
 												<div class="col-12">
@@ -665,7 +640,7 @@
 													</label>
 													<div
 														class="p-2 bg-light rounded"
-														x-text="selectedCommunication.public_report.nuisance.additional_info || 'No additional notes'"
+														x-text="additional_info || 'No additional notes'"
 													></div>
 												</div>
 											</div>