Index: lams_admin/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_admin/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_admin/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_central/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_central/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_central/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_learning/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_learning/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_learning/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_monitoring/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_tool_assessment/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_bbb/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_tool_bbb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_tool_bbb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_tool_chat/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_tool_daco/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_dimdim/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_tool_dimdim/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_tool_dimdim/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_eadventure/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_tool_eadventure/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_tool_eadventure/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_tool_images/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_tool_imscc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_tool_lamc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_tool_larsrc/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_tool_pixlr/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_tool_sbmt/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_tool_task/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_videorecorder/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_tool_videorecorder/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_tool_videorecorder/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_tool_wookie/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_tool_wookie/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_tool_wookie/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();
Index: lams_www/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rf5b39b63222050e14531ed49a96c16afe7c77b3b -r889235949834f3e9887318d10d0b21860f6b7b3c
--- lams_www/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision f5b39b63222050e14531ed49a96c16afe7c77b3b)
+++ lams_www/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 889235949834f3e9887318d10d0b21860f6b7b3c)
@@ -91,7 +91,9 @@
     	}
     }
     function closeWindow(nextAction) {
-		var notifyCloseURL = "${notifyCloseURL}";
+        // notifyCloseURL needs to be encoded in Java *twice*, otherwise it won't work
+        // for both AuthoringButton.tag and authoringConfirm.jsp
+		var notifyCloseURL = decodeURIComponent("${notifyCloseURL}");
 		if (notifyCloseURL == ""){
 			if (nextAction == "defineLater") {
 				refreshParentMonitoringWindow();