diff -r 756531566248 -r 9ae584ea86ba data/dictionary.xml
--- a/data/dictionary.xml	Sun Aug 11 18:27:22 2013 +0200
+++ b/data/dictionary.xml	Mon Aug 12 00:21:14 2013 +0200
@@ -30,6 +30,7 @@
 		<tag id="java" name="Java" description="Java and other JVM languages"/>
 		<tag id="xml" name="XML" description="eXtensible Markup Language"/>
 		<tag id="security" name="Security" description="security and cryptography"/>
+		<tag id="protocol" name="Protocol" description="communication protocol"/>
 	</tags>
 
 	<concept>
@@ -131,6 +132,7 @@
 		<tag>computer</tag>
 		<tag>xml</tag>
 		<tag>messaging</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="IMAP4" completeForm="Internet message access protocol version 4" language="en"/>
@@ -150,6 +152,7 @@
 		</explanation>
 		<tag>computer</tag>
 		<tag>messaging</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="POP3" completeForm="post office protocol version 3" language="en"/>
@@ -164,6 +167,7 @@
 		</explanation>
 		<tag>computer</tag>
 		<tag>messaging</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="SMTP" completeForm="simple mail transfer protocol" language="en"/>
@@ -175,6 +179,7 @@
 		</explanation>
 		<tag>computer</tag>
 		<tag>messaging</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="MUA" completeForm="mail user agent" language="en"/>
@@ -204,6 +209,7 @@
 		<term abbreviation="SAP" completeForm="sms application protocol" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>messaging</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="SPID" completeForm="service provider ID" language="en"/>
@@ -223,6 +229,7 @@
 		<term abbreviation="SMPP" completeForm="short message peer-to-peer" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>messaging</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="NMS" completeForm="network management system" language="en"/>
@@ -231,6 +238,7 @@
 	<concept>
 		<term abbreviation="SNMP" completeForm="simple network management protocol" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="MIB" completeForm="management information base" language="en"/>
@@ -248,17 +256,20 @@
 		<tag>charging</tag>
 		<tag>acision</tag>
 		<tag>messaging</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="RTPP" completeForm="Real Time Payment Protocol" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>charging</tag>
 		<tag>messaging</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="BIP" completeForm="billing interface protocol" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>charging</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="LTE" completeForm="Long Term Evolution" language="en"/>
@@ -413,11 +424,13 @@
 		<term abbreviation="MM1" completeForm="" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>messaging</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="MM7" completeForm="" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>messaging</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="AAA" completeForm="authentication, authorization and accounting" language="en"/>
@@ -430,11 +443,13 @@
 		<explanation language="en"><text></text></explanation>
 		<tag>security</tag>
 		<tag>charging</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="" completeForm="Radius" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>security</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="SCAP" completeForm="service charging application protocol" language="en"/>
@@ -444,6 +459,7 @@
 		<explanation language="en"><text></text></explanation>
 		<tag>ericsson</tag>
 		<tag>charging</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="DCC" completeForm="Diameter credit control" language="en"/>
@@ -746,34 +762,40 @@
 		<explanation language="en"><text>Nokia's protocol for sending and receiving MMS, is based on HTTP and transferres  binary content.</text></explanation>
 		<tag>nsn</tag>
 		<tag>messaging</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="UCP" completeForm="universal computer protocol" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>messaging</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="EMI" completeForm="external machine interface" language="en"/>
 		<explanation language="en"><text>an extension of UCP</text></explanation>
 		<tag>acision</tag>
 		<tag>messaging</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="CIMD" completeForm="computer interface to message distribution" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>nsn</tag>
 		<tag>messaging</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="URLP" completeForm="URL encoded message protocol" language="en"/>
 		<explanation language="en"><text>A simple protocol that can be used between AAG and SPA for transmitting messages. Uses HTTP GET method and encodes data in the URL or in HTTP response body</text></explanation>
 		<tag>acision</tag>
 		<tag>messaging</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="SMAP" completeForm="short message application protocol" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>messaging</tag>
+		<tag>protocol</tag>
 	</concept>
 	<!--
 	<concept>
@@ -784,6 +806,7 @@
 	<concept>
 		<term abbreviation="PAP" completeForm="push access protocol" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="SC" completeForm="service center" language="en"/>
@@ -828,6 +851,7 @@
 	<concept>
 		<term abbreviation="WAP" completeForm="wireless application protocol" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="OTA" completeForm="over-the-air" language="en"/>
@@ -851,20 +875,24 @@
 	<concept>
 		<term abbreviation="SIP" completeForm="session initiation protocol" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="RTP" completeForm="real-time transport protocol" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="SRTP" completeForm="secure RTP" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>security</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="ZRTP" completeForm="Zimmermann RTP" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>security</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="" completeForm="throttling" language="en"/>
@@ -1132,6 +1160,7 @@
 		<term abbreviation="LDAP" completeForm="Lightweight Directory Access Protocol" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="SQL" completeForm="structured query language" language="en"/>
@@ -1196,6 +1225,7 @@
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
 		<tag>xml</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="REST" completeForm="representational state transfer" language="en"/>
@@ -1223,12 +1253,14 @@
 		<term abbreviation="GIOP" completeForm="General Inter-ORB Protocol" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="RMI" completeForm="Remote Method Invocation" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
 		<tag>java</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="JAR" completeForm="Java ARchive" language="en"/>
@@ -1265,12 +1297,14 @@
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
 		<tag>java</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="HTTP" completeForm="hypertext transfer protocol" language="en"/>
 		<term abbreviation="HTTPS" completeForm="hypertext transfer protocol secure" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="SSL" completeForm="secure socket layer" language="en"/>
@@ -1278,10 +1312,13 @@
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
 		<tag>security</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="DTLS" completeForm="datagram transport layer security" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>security</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="BASH" completeForm="Bourne Again Shell" language="en"/>
@@ -1299,6 +1336,7 @@
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
 		<tag>security</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="SCP" completeForm="secure copy" language="en"/>
@@ -1311,12 +1349,14 @@
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
 		<tag>security</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="FTP" completeForm="file transfer protocol" language="en"/>
 		<term abbreviation="FTPS" completeForm="file transfer protocol secure" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="PGP" completeForm="Pretty Good Privacy" language="en"/>
@@ -1387,6 +1427,7 @@
 		<term abbreviation="" completeForm="ethernet" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="LAN" completeForm="local area network" language="en"/>
@@ -1416,6 +1457,7 @@
 		<term abbreviation="" completeForm="IP address" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="FQDN" completeForm="fully qualified domain name" language="en"/>
@@ -1431,15 +1473,18 @@
 		<term abbreviation="TCP" completeForm="transmission control protocol" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="UDP" completeForm="user datagram protocol" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="SCTP" completeForm="stream control transmission protocol" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="QoS" completeForm="quality of service" language="en"/>
@@ -1494,6 +1539,7 @@
 		<term abbreviation="DNS" completeForm="domain name system" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="ENUM" completeForm="E.164 number mapping" language="en"/>
@@ -1718,6 +1764,7 @@
 		<tag>computer</tag>
 		<tag>security</tag>
 		<tag>messaging</tag>
+		<tag>protocol</tag>
 	</concept>
 	<concept>
 		<term abbreviation="CLI" completeForm="command-line interface" language="en"/>