diff -r cf21d062a601 -r c04e26b672e9 data/dictionary.xml
--- a/data/dictionary.xml	Thu Jul 11 18:47:13 2013 +0200
+++ b/data/dictionary.xml	Thu Jul 11 19:00:48 2013 +0200
@@ -21,6 +21,7 @@
 		<tag id="nsn" name="Nokia Siemens Networks" description="comes from Nokia Siemens Networks or is specific for this company"/>
 		
 		<tag id="charging" name="Charging" description="charging, billing"/>
+		<tag id="messaging" name="Messaging" description="sending messages, receiving messages (SMS, MMS etc.)"/>
 		
 		<tag id="computer" name="Computer" description="general IS/ICT term"/>
 		<tag id="general" name="General" description="general term"/>
@@ -50,6 +51,7 @@
 				the number „160“ is iconic for SMS
 			</text>
 		</explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="" completeForm="octet" language="en"/>
@@ -61,19 +63,23 @@
 				octet is a synonym for 8-bit byte which accents that we really mean the 8-bit byte (and not e.g. the 7-bit one)
 			</text>
 		</explanation>
+		<tag>computer</tag>
 	</concept>
 	<concept>
 		<term abbreviation="MMS" completeForm="multimedia messaging service" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="DMS" completeForm="donors message service" language="en"/>
 		<term abbreviation="DMS" completeForm="dárcovská SMS" language="cs"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="EMS" completeForm="enhanced messaging service" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="SMIL" completeForm="synchronized multimedia integration language" language="en"/>
@@ -91,57 +97,68 @@
 		<term abbreviation="IM" completeForm="instant messaging" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="OTT" completeForm="over the top" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="IMAP4" completeForm="Internet message access protocol version 4" language="en"/>
 		<term abbreviation="IMAP" completeForm="Internet message access protocol" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="POP3" completeForm="post office protocol version 3" language="en"/>
 		<term abbreviation="POP" completeForm="post office protocol" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="SMTP" completeForm="simple mail transfer protocol" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="MUA" completeForm="mail user agent" language="en"/>
 		<explanation language="en"><text>an e-mail client software</text></explanation>
 		<tag>computer</tag>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="MTA" completeForm="message transfer agent " language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="MDA" completeForm="message delivery agent " language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="MIME" completeForm="multipurpose Internet mail extensions" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="XMPP" completeForm="extensible messaging and presence protocol" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
 		<tag>xml</tag>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="SAP" completeForm="sms application protocol" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="SPID" completeForm="service provider ID" language="en"/>
@@ -155,10 +172,12 @@
 	<concept>
 		<term abbreviation="UCS-2" completeForm="universal character set 2-byte" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="SMPP" completeForm="short message peer-to-peer" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="NMS" completeForm="network management system" language="en"/>
@@ -183,11 +202,13 @@
 		<explanation language="en"><text></text></explanation>
 		<tag>charging</tag>
 		<tag>acision</tag>
+		<tag>messaging</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>
 	</concept>
 	<concept>
 		<term abbreviation="BIP" completeForm="billing interface protocol" language="en"/>
@@ -346,10 +367,12 @@
 	<concept>
 		<term abbreviation="MM1" completeForm="" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="MM7" completeForm="" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="AAA" completeForm="authentication, authorization and accounting" language="en"/>
@@ -477,34 +500,42 @@
 	<concept>
 		<term abbreviation="MO" completeForm="mobile originated" language="en"/>
 		<explanation language="en"><text>traffic which comes from a cell phone resp. mobile network, e.g. an SMS sent from your Handy</text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="MT" completeForm="mobile terminated" language="en"/>
 		<explanation language="en"><text>traffic which comes to a cell phone resp. mobile network, e.g. a received SMS</text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="AO" completeForm="application originated" language="en"/>
 		<explanation language="en"><text>traffic which comes from an application i.e. not from the mobile network/phone, e.g. some weather forecast messages generated by an SPA</text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="AT" completeForm="application terminated" language="en"/>
 		<explanation language="en"><text>traffic which comes to an application i.e. not to the mobile network/phone, e.g. message sent to an application in order to subscribe the service or to send your vote</text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="MOMT" completeForm="mobile originated → mobile terminated" language="en"/>
 		<explanation language="en"><text>e.g. when Bob texts Alice from his phone to her phone</text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="MOAT" completeForm="mobile originated → application terminated" language="en"/>
 		<explanation language="en"><text>e.g. if Bob subscribes a weather forecast service by sending a message from his phone</text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="AOMT" completeForm="application originated → mobile terminated" language="en"/>
 		<explanation language="en"><text>e.g. if Alice receives to her phone a news message which she has previously subscribed</text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="AOAT" completeForm="application originated → application terminated" language="en"/>
 		<explanation language="en"><text>if two applications communicates over an SMS gateway and there are no cell phones involved; this is pretty rare, but somewhere you can met such configuration</text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="" completeForm="Handy" language="de"/>
@@ -542,6 +573,7 @@
 		<term abbreviation="" completeForm="hashing" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>security</tag>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="" completeForm="provisioning" language="en"/>
@@ -555,10 +587,12 @@
 	<concept>
 		<term abbreviation="" completeForm="short code" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="VASP" completeForm="value-added service provider" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="ESME" completeForm="external short message entity" language="en"/>
@@ -576,10 +610,12 @@
 			VAS	Value Added Service (also known as ESME or SPA or LA)
 		-->
 		<explanation language="en"><text></text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="NEP" completeForm="network end point" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="SPDB" completeForm="service provider database" language="en"/>
@@ -590,6 +626,7 @@
 		<!-- bridge mezi TCP/IP a SS7 ? -->
 		<explanation language="en"><text></text></explanation>
 		<tag>acision</tag>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="SME" completeForm="short message entity" language="en"/>
@@ -598,6 +635,7 @@
 			Ex: Your mobile handset
 		-->
 		<explanation language="en"><text></text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="GSM" completeForm="Global System for Mobile communications" language="en"/>
@@ -645,29 +683,35 @@
 		<term abbreviation="EAIF" completeForm="external application interface" language="en"/>
 		<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>
 	</concept>
 	<concept>
 		<term abbreviation="UCP" completeForm="universal computer protocol" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>messaging</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>
 	</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>
 	</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>
 	</concept>
 	<concept>
 		<term abbreviation="SMAP" completeForm="short message application protocol" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<!--
 	<concept>
@@ -682,28 +726,34 @@
 	<concept>
 		<term abbreviation="SC" completeForm="service center" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="MMSC" completeForm="MMS service center" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="SMSC" completeForm="SMS service center" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="SMSCv5" completeForm="SMS service center version 5" language="en"/>
 		<term abbreviation="v5" completeForm="" language="en"/>
 		<explanation language="en"><text>an implementation of SMSC from Acision</text></explanation>
 		<tag>acision</tag>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="IMS" completeForm="IP Multimedia Subsystem" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="IWG" completeForm="inter-working gateway" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="RCS" completeForm="Rich Communication Suite" language="en"/>
@@ -711,6 +761,7 @@
 		<term abbreviation="RCSx" completeForm="" language="en"/>
 		<term abbreviation="" completeForm="Joyn" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="WAP" completeForm="wireless application protocol" language="en"/>
@@ -756,6 +807,7 @@
 	<concept>
 		<term abbreviation="" completeForm="throttling" language="en"/>
 		<explanation language="en"><text></text></explanation>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="" completeForm="keep alive" language="en"/>
@@ -837,12 +889,14 @@
 		<term abbreviation="CPS" completeForm="Central provisioning system" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>acision</tag>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="AAG" completeForm="Acision Application Gateway" language="en"/>
 		<term abbreviation="OMG" completeForm="Open Messaging Gateway" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>acision</tag>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="GBG" completeForm="General Billing Gateway" language="en"/>
@@ -851,12 +905,14 @@
 		<term abbreviation="UGC" completeForm="Universal Gateway Component" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>acision</tag>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="BMSC" completeForm="Broadband Messaging Service Centre" language="en"/>
 		<term abbreviation="" completeForm="Fusion" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>acision</tag>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="UGC" completeForm="user generated content" language="en"/>
@@ -1348,6 +1404,7 @@
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
 		<tag>java</tag>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="JCA" completeForm="Java connector architecture" language="en"/>
@@ -1553,6 +1610,7 @@
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
 		<tag>security</tag>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="CLI" completeForm="command-line interface" language="en"/>
@@ -1684,6 +1742,7 @@
 		<term abbreviation="OOTO" completeForm="out of the office" language="en"/>
 		<explanation language="en"><text></text></explanation>
 		<tag>computer</tag>
+		<tag>messaging</tag>
 	</concept>
 	<concept>
 		<term abbreviation="" completeForm="streamlining" language="en"/>