diff --git a/pom.xml b/pom.xml
index 025e84c..d69d3d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>078efef1-d139-48ed-92f5-f8d4a0592374</groupId>
 		<artifactId>common-parent-pom</artifactId>
-		<version>1.0.28</version>
+		<version>1.0.30</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>078efef1-d139-48ed-92f5-f8d4a0592374</groupId>
 	<artifactId>common-core</artifactId>
-	<version>1.0.22</version>
+	<version>1.0.23</version>
 	<packaging>mule-application</packaging>
 	<name>common-core</name>
 	<description>Shared Mule library that provides reusable flows, resources and configuration settings common for all applications</description>
diff --git a/src/main/mule/global-configuration-salesforce.xml b/src/main/mule/global-configuration-salesforce.xml
index 4f6a3ea..d52625b 100644
--- a/src/main/mule/global-configuration-salesforce.xml
+++ b/src/main/mule/global-configuration-salesforce.xml
@@ -24,7 +24,10 @@
 			consumerKey="${salesforce.consumerkey}"
 			keyStore="${salesforce.keystore}"
 			storePassword="${salesforce.storepassword}"
-			principal="${salesforce.principal}" certificateAlias="${salesforce.certificatealias}" tokenEndpoint="${salesforce.tokenendpoint}" audienceUrl="${salesforce.audienceurl}">
+			principal="${salesforce.principal}" 
+			certificateAlias="${salesforce.certificatealias}" 
+			tokenEndpoint="${salesforce.tokenendpoint}" 
+			audienceUrl="${salesforce.audienceurl}">
 			<reconnection >
 				<reconnect />
 			</reconnection>
diff --git a/src/main/mule/global-error.xml b/src/main/mule/global-error.xml
index 946eb8d..3ef64f0 100644
--- a/src/main/mule/global-error.xml
+++ b/src/main/mule/global-error.xml
@@ -21,9 +21,10 @@
 			<ee:transform doc:name="Response">
 				<ee:message >
 					<ee:set-payload ><![CDATA[%dw 2.0
-output application/json
----
-{message: "${messages.apikit-404}"}]]></ee:set-payload>
+						output application/json
+						---
+						{message: "${messages.apikit-404}"}]]>
+					</ee:set-payload>
 				</ee:message>
 				<ee:variables >
 					<ee:set-variable variableName="httpStatus" ><![CDATA[404]]></ee:set-variable>
@@ -41,9 +42,10 @@ output application/json
 			<ee:transform doc:name="Response" >
 				<ee:message >
 					<ee:set-payload ><![CDATA[%dw 2.0
-output application/json
----
-{message: "${messages.apikit-400}"}]]></ee:set-payload>
+						output application/json
+						---
+						{message: "${messages.apikit-400}"}]]>
+					</ee:set-payload>
 				</ee:message>
 				<ee:variables >
 					<ee:set-variable variableName="httpStatus" ><![CDATA[400]]></ee:set-variable>
@@ -61,9 +63,10 @@ output application/json
 			<ee:transform doc:name="Response" >
 				<ee:message >
 					<ee:set-payload ><![CDATA[%dw 2.0
-output application/json
----
-{message: "${messages.apikit-405}"}]]></ee:set-payload>
+						output application/json
+						---
+						{message: "${messages.apikit-405}"}]]>
+					</ee:set-payload>
 				</ee:message>
 				<ee:variables >
 					<ee:set-variable variableName="httpStatus" ><![CDATA[405]]></ee:set-variable>
@@ -81,9 +84,10 @@ output application/json
 			<ee:transform doc:name="Response" >
 				<ee:message >
 					<ee:set-payload ><![CDATA[%dw 2.0
-output application/json
----
-{message: "${messages.apikit-406}"}]]></ee:set-payload>
+						output application/json
+						---
+						{message: "${messages.apikit-406}"}]]>
+					</ee:set-payload>
 				</ee:message>
 				<ee:variables >
 					<ee:set-variable variableName="httpStatus" ><![CDATA[406]]></ee:set-variable>
@@ -100,9 +104,10 @@ output application/json
 			<ee:transform doc:name="Response" >
 				<ee:message >
 					<ee:set-payload ><![CDATA[%dw 2.0
-output application/json
----
-{message: "${messages.apikit-501}"}]]></ee:set-payload>
+						output application/json
+						---
+						{message: "${messages.apikit-501}"}]]>
+					</ee:set-payload>
 				</ee:message>
 				<ee:variables >
 					<ee:set-variable variableName="httpStatus" ><![CDATA[501]]></ee:set-variable>
@@ -119,9 +124,10 @@ output application/json
 			<ee:transform doc:name="Response" >
 				<ee:message >
 					<ee:set-payload ><![CDATA[%dw 2.0
-output application/json
----
-{message: "${messages.apikit-415}"}]]></ee:set-payload>
+						output application/json
+						---
+						{message: "${messages.apikit-415}"}]]>
+					</ee:set-payload>
 				</ee:message>
 				<ee:variables >
 					<ee:set-variable variableName="httpStatus" ><![CDATA[415]]></ee:set-variable>
@@ -140,10 +146,11 @@ output application/json
 			<ee:transform doc:name="Response" >
 				<ee:message >
 					<ee:set-payload ><![CDATA[%dw 2.0
-output application/json
----
-{message: "${messages.backend-error}"}
-]]></ee:set-payload>
+						output application/json
+						---
+						{message: "${messages.backend-error}"}
+						]]>
+					</ee:set-payload>
 				</ee:message>
 			</ee:transform>
 		</on-error-propagate>
diff --git a/src/main/mule/test-salesforce-endpoint.xml b/src/main/mule/test-salesforce-endpoint.xml
index 8fbabdf..095c17d 100644
--- a/src/main/mule/test-salesforce-endpoint.xml
+++ b/src/main/mule/test-salesforce-endpoint.xml
@@ -29,9 +29,12 @@
 			doc:name="Query" 
 			config-ref="GlobalSalesforceConfig">
 			
-			<salesforce:salesforce-query ><![CDATA[SELECT firstName__c, lastName__c, address__c, Id 
-FROM Customer__c 
- WHERE Id ='a018b00000z9s56AAA']]></salesforce:salesforce-query>
+			<salesforce:salesforce-query ><![CDATA[
+				SELECT firstName__c, lastName__c, address__c, Id 
+				FROM Customer__c 
+				WHERE Id ='a018b00000z9s56AAA'
+			]]>
+ 			</salesforce:salesforce-query>
 		</salesforce:query>
 		<logger level="INFO" doc:name="show payload" message="#[payload]"/>
 	</flow>