diff --git a/xep-0347.xml b/xep-0347.xml
index 5761449e..53e2adfa 100644
--- a/xep-0347.xml
+++ b/xep-0347.xml
@@ -47,6 +47,14 @@
 			<jid>TBD</jid>
 			<uri>http://www-rnks.informatik.tu-cottbus.de/~rklauck</uri>
 		</author>
+		<revision>
+			<version>0.2</version>
+			<date>2014-09-07</date>
+			<initials>pw</initials>
+			<remark>
+				<p>Added a small note regarding URL encoding of hash signs, and corrected the Google Chart URL example.</p>
+			</remark>
+		</revision>
 		<revision>
 		  <version>0.1</version>
 		  <date>2014-04-10</date>
@@ -110,10 +118,6 @@
 				<td>xep-0000-IoT-BatteryPoweredSensors</td>
 				<td>Defines how to handle the peculiars related to battery powered devices, and other devices intermittently available on the network.</td>
 			</tr>
-			<tr>
-				<td>xep-0000-IoT-Discovery</td>
-				<td>This specification. Defines the peculiars of Thing discovery in Internet of Things. Apart from discovering Things by JID, it also defines how to discover Things based on location, etc.</td>
-			</tr>
 			<tr>
 				<td>xep-0000-IoT-Events</td>
 				<td>Defines how Things send events, how event subscription, hysteresis levels, etc., are configured.</td>
@@ -169,6 +173,10 @@
 				<td>XEP-0336</td>
 				<td>Defines extensions for how dynamic forms can be created, based on &xep0004;, &xep0122;, &xep0137; and &xep0141;.</td>
 			</tr>
+			<tr>
+				<td>XEP-0347</td>
+				<td>This specification. Defines the peculiars of Thing discovery in Internet of Things. Apart from discovering Things by JID, it also defines how to discover Things based on location, etc.</td>
+			</tr>
 		</table>
 	</section1>
 	<section1 topic='Glossary' anchor='glossary'>
@@ -729,11 +737,14 @@
 				Using UTF-8 encoding when generating the QR-code, this string returns the following QR-code:
 			</p>
 			<p>
-				<img src='https://chart.googleapis.com/chart?cht=qr&amp;chs=200x200&amp;chl=IoTDisco;SN:394872348732948723;MAN:www.ktc.se;MODEL:IMC;#V:1.2;KEY:4857402340298342'/>
+				<img src='https://chart.googleapis.com/chart?cht=qr&amp;chs=200x200&amp;chl=IoTDisco;SN:394872348732948723;MAN:www.ktc.se;MODEL:IMC;%23V:1.2;KEY:4857402340298342'/>
 			</p>
 			<p>
 				To generate a QR-code, Google Chart API can be used:
-				<link url='https://chart.googleapis.com/chart?cht=qr&amp;chs=200x200&amp;chl=IoTDisco;SN:394872348732948723;MAN:www.ktc.se;MODEL:IMC;#V:1.2;KEY:4857402340298342'>https://chart.googleapis.com/chart?cht=qr&amp;chs=200x200&amp;chl=IoTDisco;SN:394872348732948723;MAN:www.ktc.se;MODEL:IMC;#V:1.2;KEY:4857402340298342</link>
+				<link url='https://chart.googleapis.com/chart?cht=qr&amp;chs=200x200&amp;chl=IoTDisco;SN:394872348732948723;MAN:www.ktc.se;MODEL:IMC;%23V:1.2;KEY:4857402340298342'>https://chart.googleapis.com/chart?cht=qr&amp;chs=200x200&amp;chl=IoTDisco;SN:394872348732948723;MAN:www.ktc.se;MODEL:IMC;%23V:1.2;KEY:4857402340298342</link>
+			</p>
+			<p>
+				<strong>Note:</strong> The hash sign (#) has been URL encoded to <strong>%23</strong> in the URL.
 			</p>
 			<p>
 				Once the client has the required meta information about the Thing to claim ownership, it sends itself the following request to the Thing Registry:
@@ -1534,7 +1545,7 @@
 		<example caption="Service discovery information response from each component">
 			<![CDATA[
    <iq type='result'
-       from='provisioning@clayster.com'
+       from='discovery.clayster.com'
        to='device@clayster.com/device'
        id='16'>
       <query xmlns='http://jabber.org/protocol/disco#info'>
@@ -1788,18 +1799,18 @@
 				meta-data tags used in Thing Registry registrations can be found out by sniffing the network, making it possible to hijack the corresponding devices.
 			</p>
 		</section2>
-		<section3 topic='DHCP Security Considerations'>
+		<section2 topic='DHCP Security Considerations'>
 			<p>TBD</p>
 			<!-- TODO -->
-		</section3>
-		<section3 topic='DNS Security Considerations'>
+		</section2>
+		<section2 topic='DNS Security Considerations'>
 			<p>TBD</p>
 			<!-- TODO -->
-		</section3>
-		<section3 topic='UPnP Security Considerations'>
+		</section2>
+		<section2 topic='UPnP Security Considerations'>
 			<p>TBD</p>
 			<!-- TODO -->
-		</section3>
+		</section2>
 	</section1>
 	<section1 topic='IANA Considerations' anchor='iana'>
 		<p>This document requires no interaction with &IANA;.</p>