diff --git a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
index 5379cc9d04..9c062c3e30 100755
--- a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
+++ b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
@@ -450,7 +450,7 @@ class ApiController {
 				returncode(RESP_CODE_SUCCESS)
 				messageKey("successfullyJoined")
 				message("You have joined successfully.")
-				meeting_id(us.meetingID)
+				meeting_id() { mkp.yield(us.meetingID) }
 				user_id(us.internalUserId)
 				auth_token(us.authToken)
 			  }
@@ -803,22 +803,22 @@ class ApiController {
                 meetings {
                   for (m in mtgs) {
                     meeting {
-                      meetingID(m.getExternalId())
-				              meetingName(m.getName())
-				              createTime(m.getCreateTime())
-											createDate(formatPrettyDate(m.getCreateTime()))
-                      voiceBridge(m.getTelVoice())
-                      dialNumber(m.getDialNumber())
-                      attendeePW(m.getViewerPassword())
-                      moderatorPW(m.getModeratorPassword())
+                      meetingID() { mkp.yield(m.getExternalId()) } 
+                      meetingName() { mkp.yield(m.getName()) }
+                      createTime(m.getCreateTime())
+                      createDate(formatPrettyDate(m.getCreateTime()))
+                      voiceBridge() { mkp.yield(m.getTelVoice()) }
+                      dialNumber() { mkp.yield(m.getDialNumber()) }
+                      attendeePW() { mkp.yield(m.getViewerPassword()) }
+                      moderatorPW() { mkp.yield(m.getModeratorPassword()) }
                       hasBeenForciblyEnded(m.isForciblyEnded() ? "true" : "false")
                       running(m.isRunning() ? "true" : "false")
                       participantCount(m.getNumUsers())
                       listenerCount(m.getNumListenOnly())
                       voiceParticipantCount(m.getNumVoiceJoined())
                       videoCount(m.getNumVideos())
-											duration(m.duration)
-											hasUserJoined(m.hasUserJoined())
+                      duration(m.duration)
+                      hasUserJoined(m.hasUserJoined())
                     }
                   }
                 }
@@ -896,9 +896,9 @@ class ApiController {
                 sessions {
                   for (m in sssns) {
                     meeting {
-                      meetingID(m.meetingID)
-                      meetingName(m.conferencename)
-                      userName(m.fullname)
+                      meetingID() { mkp.yield(m.meetingID) }
+                      meetingName() { mkp.yield(m.conferencename) }
+                      userName() { mkp.yield(m.fullname) }
                     }
                   }
                 }
@@ -1392,10 +1392,10 @@ class ApiController {
               subscriptions() {
                 list.each{ item ->
                   subscription(){
-                    subscriptionID(item.get("subscriptionID"))
-                    event(item.get("event"))
-                    callbackURL(item.get("callbackURL"))
-                    active(item.get("active"))  
+                    subscriptionID() { mkp.yield(item.get("subscriptionID")) }
+                    event() { mkp.yield(item.get("event")) }
+                    callbackURL() { mkp.yield(item.get("callbackURL")) }
+                    active()  { mkp.yield(item.get("active")) } 
                   }
                 }
               }
@@ -1443,7 +1443,7 @@ class ApiController {
 				response() {
 				  returncode("FAILED")
 				  message("Could not find conference.")
-				  logoutURL(logoutUrl)
+				  logoutURL() { mkp.yield(logoutUrl) }
 				}
 			  }
 			}
@@ -1451,9 +1451,7 @@ class ApiController {
 		} else {
 			UserSession us = meetingService.getUserSession(session['user-token']);
 			log.info("Found session for " + us.fullname)
-			println ("Found session for " + us.fullname)
-			println us.configXML
-			
+		
 			response.addHeader("Cache-Control", "no-cache")
 			render text: us.configXML, contentType: 'text/xml'
 		}
@@ -1556,10 +1554,10 @@ class ApiController {
               defaultLayout = us.defaultLayout
               avatarURL = us.avatarURL
               customdata = array {
-								userCustomData.each { k, v ->
-									// Somehow we need to prepend something (custdata) for the JSON to work
-									custdata "$k" : v
-								}
+                 userCustomData.each { k, v ->
+                      // Somehow we need to prepend something (custdata) for the JSON to work
+                      custdata "$k" : v
+				 }
               }
             }
           }
@@ -1726,7 +1724,7 @@ class ApiController {
 	
     // Do we agree on the checksum? If not, complain.   
     if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
-        errors.checksumError()
+      errors.checksumError()
       respondWithErrors(errors)
       return
     }
@@ -1766,8 +1764,8 @@ class ApiController {
               recs.values().each { r ->
 				  recording() {
                   recordID(r.getId())
-				  meetingID(r.getMeetingID())
-				  name(''){
+				  meetingID() { mkp.yield(r.getMeetingID()) }
+				  name('') {
 					  mkp.yieldUnescaped("<![CDATA["+r.getName()+"]]>")
 				  }
                   published(r.isPublished())
@@ -2073,19 +2071,19 @@ class ApiController {
         render(contentType:"text/xml") {
           response() {
             returncode(RESP_CODE_SUCCESS)
-			      meetingName(meeting.getName())
-            meetingID(meeting.getExternalId())
+            meetingName() { mkp.yield(meeting.getName()) }
+            meetingID() { mkp.yield(meeting.getExternalId()) }
             internalMeetingID(meeting.getInternalId())
-			      createTime(meeting.getCreateTime())
-						createDate(formatPrettyDate(meeting.getCreateTime()))
-			      voiceBridge(meeting.getTelVoice())
-			      dialNumber(meeting.getDialNumber())
-            attendeePW(meeting.getViewerPassword())
-            moderatorPW(meeting.getModeratorPassword())
+            createTime(meeting.getCreateTime())
+            createDate(formatPrettyDate(meeting.getCreateTime()))
+            voiceBridge() { mkp.yield(meeting.getTelVoice()) }
+            dialNumber() { mkp.yield(meeting.getDialNumber()) }
+            attendeePW() { mkp.yield(meeting.getViewerPassword()) }
+            moderatorPW() { mkp.yield(meeting.getModeratorPassword()) }
             running(meeting.isRunning() ? "true" : "false")
-						duration(meeting.duration)
-						hasUserJoined(meeting.hasUserJoined())
-			      recording(meeting.isRecord() ? "true" : "false")
+            duration(meeting.duration)
+            hasUserJoined(meeting.hasUserJoined())
+            recording(meeting.isRecord() ? "true" : "false")
             hasBeenForciblyEnded(meeting.isForciblyEnded() ? "true" : "false")
             startTime(meeting.getStartTime())
             endTime(meeting.getEndTime())
@@ -2098,8 +2096,8 @@ class ApiController {
             attendees() {
               meeting.getUsers().each { att ->
                 attendee() {
-                  userID("${att.externalUserId}")
-                  fullName("${att.fullname}")
+                  userID() { mkp.yield("${att.externalUserId}") }
+                  fullName() { mkp.yield("${att.fullname}") }
                   role("${att.role}")
                   isPresenter("${att.isPresenter()}")
                   isListeningOnly("${att.isListeningOnly()}")
@@ -2134,15 +2132,15 @@ class ApiController {
         render(contentType:"text/xml") {
           response() {
             returncode(RESP_CODE_SUCCESS)
-            meetingID(meeting.getExternalId())
-            attendeePW(meeting.getViewerPassword())
-            moderatorPW(meeting.getModeratorPassword())
+            meetingID() { mkp.yield(meeting.getExternalId()) }
+            attendeePW() { mkp.yield(meeting.getViewerPassword()) }
+            moderatorPW() { mkp.yield(meeting.getModeratorPassword()) }
             createTime(meeting.getCreateTime())
-            voiceBridge(meeting.getTelVoice())
-            dialNumber(meeting.getDialNumber())
-						createDate(formatPrettyDate(meeting.getCreateTime()))
-						hasUserJoined(meeting.hasUserJoined())
-						duration(meeting.duration)
+            voiceBridge() { mkp.yield(meeting.getTelVoice()) }
+            dialNumber()  { mkp.yield(meeting.getDialNumber()) }
+            createDate(formatPrettyDate(meeting.getCreateTime()))
+            hasUserJoined(meeting.hasUserJoined())
+            duration(meeting.duration)
             hasBeenForciblyEnded(meeting.isForciblyEnded() ? "true" : "false")
             messageKey(msgKey == null ? "" : msgKey)
             message(msg == null ? "" : msg)