diff --git a/code/game/machinery/computer/pod_tracking_console.dm b/code/game/machinery/computer/pod_tracking_console.dm
index 033a77801b4..060b58eda90 100644
--- a/code/game/machinery/computer/pod_tracking_console.dm
+++ b/code/game/machinery/computer/pod_tracking_console.dm
@@ -37,6 +37,7 @@
 		ui = new(user, src, ui_key, "pod_tracking.tmpl", "Pod Tracking Console", 400, 500)
 		ui.set_initial_data(data)
 		ui.open()
+		ui.set_auto_update(1)
 
 /obj/machinery/computer/podtracker/Topic(href, href_list)
 	if(..())
diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm
index 0d0c6b255f3..84c896a0ab3 100644
--- a/code/game/mecha/mecha_control_console.dm
+++ b/code/game/mecha/mecha_control_console.dm
@@ -35,6 +35,7 @@
 		ui = new(user, src, ui_key, "exosuit_control.tmpl", "Exosuit Control Console", 420, 500)
 		ui.set_initial_data(data)
 		ui.open()
+		ui.set_auto_update(1)
 
 /obj/machinery/computer/mecha/Topic(href, href_list)
 	if(..())
@@ -80,7 +81,7 @@
 	var/obj/mecha/M = src.loc
 	var/list/answer[0]
 	answer["reference"] = "\ref[src]"
-	answer["name"] = html_encode(sanitize(M.name)) // Has to be encoded to prevent NanoUI from blanking - JavaScript decodes it in the .tmpl
+	answer["name"] = sanitize(replacetext(M.name,"\"","")) // Apostrophes break JSON
 	if(M.cell)
 		answer["cell"] = 1
 		answer["cell_capacity"] = M.cell.maxcharge
@@ -90,8 +91,9 @@
 		answer["cell"] = 0
 	answer["integrity"] = M.health/initial(M.health)*100
 	answer["airtank"] = M.return_pressure()
-	answer["pilot"] = "[M.occupant||"None"]"
-	answer["location"] = "[sanitize(get_area(M))||"Unknown"]"
+	answer["pilot"] = "[M.occupant||"None"]"	 	
+	var/area/area = get_area(M)
+	answer["location"] = "[sanitize(area.name)||"Unknown"]"
 	answer["equipment"] = "[M.selected||"None"]"
 	if(istype(M, /obj/mecha/working/ripley))
 		var/obj/mecha/working/ripley/RM = M
diff --git a/nano/templates/exosuit_control.tmpl b/nano/templates/exosuit_control.tmpl
index 98588c89e9a..c3b88d50f54 100644
--- a/nano/templates/exosuit_control.tmpl
+++ b/nano/templates/exosuit_control.tmpl
@@ -2,17 +2,11 @@
 Title: Exosuit Control Console
 Used In File(s): \code\game\mecha\mecha_control_console.dm
 -->
-<script type="text/javascript">
-	$('.name').each(function(key, value) {
-		var name = decodeURI($(value).text());
-		$(value).text(name);	
-	});
-</script>
 {{if data.screen == 0}}
 	{{for data.mechas}}
 		<hr>
 		<div class='item'>
-			<h2 class="name">{{:value.name}}</h2>
+			<h2>{{:value.name}}</h2>
 			<h3>Information</h3>
 			<div class="itemLabel">
 				Pilot: