diff --git a/diameter/dictionary.xml b/diameter/dictionary.xml
index 1bdde0e7d8..b1a7b90c70 100644
--- a/diameter/dictionary.xml
+++ b/diameter/dictionary.xml
@@ -1643,7 +1643,7 @@
 			<enum name="INSUFFICIENT_CLASSIFIERS" code="5047"/>
 			<enum name="DIAMETER_ERROR_EAP_CODE_UNKNOWN" code="5048"/>
 
-      <!-- (Ericsson) SCAP Result Codes, see 155 19-FAY 112 51/2 rev B -->
+			<!-- (Ericsson) SCAP Result Codes, see 155 19-FAY 112 51/2 rev B -->
 			<enum name="DIAMETER_END_USER_SERVICE_DENIED" code="4241"/>
 			<enum name="DIAMETER_END_USER_NOT_FOUND" code="5241"/>
 			<!-- END SCAP Result Codes -->
@@ -1960,23 +1960,23 @@
 		</avp>
 		<!-- RFC7944 AVP -->
 		<avp name="DRMP" code="301" vendor-bit="mustnot">
-		        <type type-name="Enumerated"/>
-		                <enum name="PRIORITY_0" code="0"/>
-		                <enum name="PRIORITY_1" code="1"/>
-		                <enum name="PRIORITY_2" code="2"/>
-		                <enum name="PRIORITY_3" code="3"/>
-		                <enum name="PRIORITY_4" code="4"/>
-		                <enum name="PRIORITY_5" code="5"/>
-		                <enum name="PRIORITY_6" code="6"/>
-		                <enum name="PRIORITY_7" code="7"/>
-		                <enum name="PRIORITY_8" code="8"/>
-		                <enum name="PRIORITY_9" code="9"/>
-		                <enum name="PRIORITY_10" code="10"/>
-		                <enum name="PRIORITY_11" code="11"/>
-		                <enum name="PRIORITY_12" code="12"/>
-		                <enum name="PRIORITY_13" code="13"/>
-		                <enum name="PRIORITY_14" code="14"/>
-		                <enum name="PRIORITY_15" code="15"/>
+			<type type-name="Enumerated"/>
+				<enum name="PRIORITY_0" code="0"/>
+				<enum name="PRIORITY_1" code="1"/>
+				<enum name="PRIORITY_2" code="2"/>
+				<enum name="PRIORITY_3" code="3"/>
+				<enum name="PRIORITY_4" code="4"/>
+				<enum name="PRIORITY_5" code="5"/>
+				<enum name="PRIORITY_6" code="6"/>
+				<enum name="PRIORITY_7" code="7"/>
+				<enum name="PRIORITY_8" code="8"/>
+				<enum name="PRIORITY_9" code="9"/>
+				<enum name="PRIORITY_10" code="10"/>
+				<enum name="PRIORITY_11" code="11"/>
+				<enum name="PRIORITY_12" code="12"/>
+				<enum name="PRIORITY_13" code="13"/>
+				<enum name="PRIORITY_14" code="14"/>
+				<enum name="PRIORITY_15" code="15"/>
 		</avp>
 
 		<!-- 302-317    Unallocated -->
@@ -3241,8 +3241,8 @@
 				<gavp name="Sponsor-Identity"/>
 				<gavp name="Application-Service-Provider-Identity"/>
 				<gavp name="Required-Access-Info"/>
-				<gavp name="Sharing-Key-DL">
-				<gavp name="Sharing-Key-UL">
+				<gavp name="Sharing-Key-DL"/>
+				<gavp name="Sharing-Key-UL"/>
 				<gavp name="Traffic-Steering-Policy-Identifier-DL"/>
 				<gavp name="Traffic-Steering-Policy-Identifier-UL"/>
 			</grouped>
@@ -3804,7 +3804,7 @@
 				<gavp name="Mute-Notification"/>
 				<gavp name="Traffic-Steering-Policy-Identifier-DL"/>
 				<gavp name="Traffic-Steering-Policy-Identifier-UL"/>
-				<gavp name="ToS-Traffic-Class">
+				<gavp name="ToS-Traffic-Class"/>
 			</grouped>
 		</avp>
 		<avp name="ADC-Rule-Base-Name" code="1095" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
@@ -6228,46 +6228,48 @@
 		</avp>
 
 		<!--
-GERAN-Positioning-Info 2524 7.4.29 Grouped V M No
-GERAN-Positioning-Data 2525 7.4.30 OctetString V M No
-GERAN-GANSS-Positioning-Data 2526 7.4.31 OctetString V M No
-UTRAN-Positioning-Info 2527 7.4.32 Grouped V M No
-UTRAN-Positioning-Data 2528 7.4.33 OctetString V M No
-UTRAN-GANSS-Positioning-Data 2529 7.4.34 OctetString V M No
-LRR-Flags 2530 7.4.35 Unsigned32 V M No
-LCS-Reference-Number 2531 7.4.37 OctetString V M No
-Deferred-Location-Type 2532 7.4.36 Unsigned32 V M No
-Area-Event-Info 2533 7.4.38 Grouped V M No
-Area-Definition 2534 7.4.39 Grouped V M No
-Area 2535 7.4.40 Grouped V M No
-Area-Type 2536 7.4.41 Unsigned32 V M No
-Area-Identification 2537 7.4.42 Grouped V M No
-Occurrence-Info 2538 7.4.43 Enumerated V M No
-Interval-Time 2539 7.4.44 Unsigned32 V M No
-Periodic-LDR-Information 2540 7.4.45 Grouped V M No
-Reporting-Amount 2541 7.4.46 Unsigned32 V M No
-Reporting-Interval 2542 7.4.47 Unsigned32 V M No
-Reporting-PLMN-List 2543 7.4.48 Grouped V M No
-PLMN-ID-List 2544 7.4.49 Grouped V M No
-PLR-Flags 2545 7.4.52 Unsigned32 V M No
-PLA-Flags 2546 7.4.53 Unsigned32 V M No
-Deferred-MT-LR-Data 2547 7.4.54 Grouped V M No
-Termination-Cause 2548 7.4.55 Unsigned32 V M No
-LRA-Flags 2549 7.4.56 Unsigned32 V M No
-Periodic-Location-Support-Indicator 2550 7.4.50 Enumerated V M No
-Prioritized-List-Indicator 2551 7.4.51 Enumerated V M No
-ESMLC-Cell-Info 2552 7.4.57 Grouped V M No
-Cell-Portion-ID 2553 7.4.58 Unsigned32 V M No
-1xRTT-RCID 2554 7.4.59 OctetString V M No
--->
+		GERAN-Positioning-Info 2524 7.4.29 Grouped V M No
+		GERAN-Positioning-Data 2525 7.4.30 OctetString V M No
+		GERAN-GANSS-Positioning-Data 2526 7.4.31 OctetString V M No
+		UTRAN-Positioning-Info 2527 7.4.32 Grouped V M No
+		UTRAN-Positioning-Data 2528 7.4.33 OctetString V M No
+		UTRAN-GANSS-Positioning-Data 2529 7.4.34 OctetString V M No
+		LRR-Flags 2530 7.4.35 Unsigned32 V M No
+		LCS-Reference-Number 2531 7.4.37 OctetString V M No
+		Deferred-Location-Type 2532 7.4.36 Unsigned32 V M No
+		Area-Event-Info 2533 7.4.38 Grouped V M No
+		Area-Definition 2534 7.4.39 Grouped V M No
+		Area 2535 7.4.40 Grouped V M No
+		Area-Type 2536 7.4.41 Unsigned32 V M No
+		Area-Identification 2537 7.4.42 Grouped V M No
+		Occurrence-Info 2538 7.4.43 Enumerated V M No
+		Interval-Time 2539 7.4.44 Unsigned32 V M No
+		Periodic-LDR-Information 2540 7.4.45 Grouped V M No
+		Reporting-Amount 2541 7.4.46 Unsigned32 V M No
+		Reporting-Interval 2542 7.4.47 Unsigned32 V M No
+		Reporting-PLMN-List 2543 7.4.48 Grouped V M No
+		PLMN-ID-List 2544 7.4.49 Grouped V M No
+		PLR-Flags 2545 7.4.52 Unsigned32 V M No
+		PLA-Flags 2546 7.4.53 Unsigned32 V M No
+		Deferred-MT-LR-Data 2547 7.4.54 Grouped V M No
+		Termination-Cause 2548 7.4.55 Unsigned32 V M No
+		LRA-Flags 2549 7.4.56 Unsigned32 V M No
+		Periodic-Location-Support-Indicator 2550 7.4.50 Enumerated V M No
+		Prioritized-List-Indicator 2551 7.4.51 Enumerated V M No
+		ESMLC-Cell-Info 2552 7.4.57 Grouped V M No
+		Cell-Portion-ID 2553 7.4.58 Unsigned32 V M No
+		1xRTT-RCID 2554 7.4.59 OctetString V M No
+		-->
+
 		<avp name="Civic-Address" code="2556" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="UTF8String"/>
 		</avp>
 		<avp name="Barometric-Pressure" code="2557" vendor-bit="must" vendor-id="TGPP">
 			<type type-name="Unsigned32"/>
 		</avp>
-<!--
-UTRAN-Additional-Positioning-Data 2558 7.4.63 OctetString V M No
+
+		<!--
+		UTRAN-Additional-Positioning-Data 2558 7.4.63 OctetString V M No
 		Note: The AVP codes from 2524 to 2599 are reserved for TS 29.172
 		-->
 
@@ -6852,8 +6854,8 @@ UTRAN-Additional-Positioning-Data 2558 7.4.63 OctetString V M No
 	<application id="16777333"	name="Rivada Xf"			uri="none"/>
 	<application id="16777334"	name="Rivada Xp"			uri="none"/>
 	<application id="16777335"	name="3GPP MB2-C"			uri="http://www.3gpp.org/ftp/Specs/html-info/29468.htm"/>
-  <!-- application 16777336 (3GPP PC4a)	is defined in TGPP.xml -->
-  <application id="16777337"	name="3GPP PC2"				uri="http://www.3gpp.org/ftp/Specs/html-info/29343.htm"/>
+	<!-- application 16777336 (3GPP PC4a)	is defined in TGPP.xml -->
+	<application id="16777337"	name="3GPP PC2"				uri="http://www.3gpp.org/ftp/Specs/html-info/29343.htm"/>
 	<application id="16777338"	name="Juniper Domain Policy"		uri="none"/>
 	<application id="16777339"	name="Host Observer"			uri="none"/>
 	<application id="16777340"	name="3GPP PC6/PC7"			uri="http://www.3gpp.org/ftp/Specs/html-info/29345.htm"/>