diff --git a/api/CommonAPI/src/blackberry/common/util/URLDecoder.java b/api/CommonAPI/src/blackberry/common/util/URLDecoder.java
index d57ba7b..d7ba811 100644
--- a/api/CommonAPI/src/blackberry/common/util/URLDecoder.java
+++ b/api/CommonAPI/src/blackberry/common/util/URLDecoder.java
@@ -44,7 +44,7 @@ private URLDecoder() {
         decodingMap.put( "%21", "!" );
         decodingMap.put( "%22", "\"" );
         decodingMap.put( "%23", "#" );
-        decodingMap.put( "$", "%24" );
+        decodingMap.put( "%24", "$" );
         decodingMap.put( "%25", "%" );
         decodingMap.put( "%26", "&" );
         decodingMap.put( "%27", "'" );
@@ -136,133 +136,133 @@ private URLDecoder() {
         decodingMap.put( "%7D", "}" );
         decodingMap.put( "%7E", "~" );
         decodingMap.put( "%7F", " " );
-        decodingMap.put( "%80", "€" );
+        decodingMap.put( "%80", "�" );
         decodingMap.put( "%81", " " );
-        decodingMap.put( "%82", "‚" );
-        decodingMap.put( "%83", "ƒ" );
-        decodingMap.put( "%84", "„" );
-        decodingMap.put( "%85", "…" );
-        decodingMap.put( "%86", "†" );
-        decodingMap.put( "%87", "‡" );
-        decodingMap.put( "%88", "ˆ" );
-        decodingMap.put( "%89", "‰" );
-        decodingMap.put( "%8A", "Š" );
-        decodingMap.put( "%8B", "‹" );
-        decodingMap.put( "%8C", "Œ" );
+        decodingMap.put( "%82", "�" );
+        decodingMap.put( "%83", "�" );
+        decodingMap.put( "%84", "�" );
+        decodingMap.put( "%85", "�" );
+        decodingMap.put( "%86", "�" );
+        decodingMap.put( "%87", "�" );
+        decodingMap.put( "%88", "�" );
+        decodingMap.put( "%89", "�" );
+        decodingMap.put( "%8A", "�" );
+        decodingMap.put( "%8B", "�" );
+        decodingMap.put( "%8C", "�" );
         decodingMap.put( "%8D", " " );
-        decodingMap.put( "%8E", "Ž" );
+        decodingMap.put( "%8E", "�" );
         decodingMap.put( "%8F", " " );
         decodingMap.put( "%90", " " );
-        decodingMap.put( "%91", "‘" );
-        decodingMap.put( "%92", "’" );
-        decodingMap.put( "%93", "“" );
-        decodingMap.put( "%94", "”" );
-        decodingMap.put( "%95", "•" );
-        decodingMap.put( "%96", "–" );
-        decodingMap.put( "%97", "—" );
-        decodingMap.put( "%98", "˜" );
-        decodingMap.put( "%99", "™" );
-        decodingMap.put( "%9A", "š" );
-        decodingMap.put( "%9B", "›" );
-        decodingMap.put( "%9C", "œ" );
+        decodingMap.put( "%91", "�" );
+        decodingMap.put( "%92", "�" );
+        decodingMap.put( "%93", "�" );
+        decodingMap.put( "%94", "�" );
+        decodingMap.put( "%95", "�" );
+        decodingMap.put( "%96", "�" );
+        decodingMap.put( "%97", "�" );
+        decodingMap.put( "%98", "�" );
+        decodingMap.put( "%99", "�" );
+        decodingMap.put( "%9A", "�" );
+        decodingMap.put( "%9B", "�" );
+        decodingMap.put( "%9C", "�" );
         decodingMap.put( "%9D", " " );
-        decodingMap.put( "%9E", "ž" );
-        decodingMap.put( "%9F", "Ÿ" );
+        decodingMap.put( "%9E", "�" );
+        decodingMap.put( "%9F", "�" );
         decodingMap.put( "%A0", " " );
-        decodingMap.put( "%A1", "¡" );
-        decodingMap.put( "%A2", "¢" );
-        decodingMap.put( "%A3", "£" );
+        decodingMap.put( "%A1", "�" );
+        decodingMap.put( "%A2", "�" );
+        decodingMap.put( "%A3", "�" );
         decodingMap.put( "%A4", " " );
-        decodingMap.put( "%A5", "¥" );
+        decodingMap.put( "%A5", "�" );
         decodingMap.put( "%A6", "|" );
-        decodingMap.put( "%A7", "§" );
-        decodingMap.put( "%A8", "¨" );
-        decodingMap.put( "%A9", "©" );
-        decodingMap.put( "%AA", "ª" );
-        decodingMap.put( "%AB", "«" );
-        decodingMap.put( "%AC", "¬" );
-        decodingMap.put( "%AD", "¯" );
-        decodingMap.put( "%AE", "®" );
-        decodingMap.put( "%AF", "¯" );
-        decodingMap.put( "%B0", "°" );
-        decodingMap.put( "%B1", "±" );
-        decodingMap.put( "%B2", "²" );
-        decodingMap.put( "%B3", "³" );
-        decodingMap.put( "%B4", "´" );
-        decodingMap.put( "%B5", "µ" );
-        decodingMap.put( "%B6", "¶" );
-        decodingMap.put( "%B7", "•" );
-        decodingMap.put( "%B8", "¸" );
-        decodingMap.put( "%B9", "¹" );
-        decodingMap.put( "%BA", "º" );
-        decodingMap.put( "%BB", "»" );
-        decodingMap.put( "%BC", "¼" );
-        decodingMap.put( "%BD", "½" );
-        decodingMap.put( "%BE", "¾" );
-        decodingMap.put( "%BF", "¿" );
-        decodingMap.put( "%C0", "À" );
-        decodingMap.put( "%C1", "Á" );
-        decodingMap.put( "%C2", "Â" );
-        decodingMap.put( "%C3", "Ã" );
-        decodingMap.put( "%C4", "Ä" );
-        decodingMap.put( "%C5", "Å" );
-        decodingMap.put( "%C6", "Æ" );
-        decodingMap.put( "%C7", "Ç" );
-        decodingMap.put( "%C8", "È" );
-        decodingMap.put( "%C9", "É" );
-        decodingMap.put( "%CA", "Ê" );
-        decodingMap.put( "%CB", "Ë" );
-        decodingMap.put( "%CC", "Ì" );
-        decodingMap.put( "%CD", "Í" );
-        decodingMap.put( "%CE", "Î" );
-        decodingMap.put( "%CF", "Ï" );
-        decodingMap.put( "%D0", "Ð" );
-        decodingMap.put( "%D1", "Ñ" );
-        decodingMap.put( "%D2", "Ò" );
-        decodingMap.put( "%D3", "Ó" );
-        decodingMap.put( "%D4", "Ô" );
-        decodingMap.put( "%D5", "Õ" );
-        decodingMap.put( "%D6", "Ö" );
+        decodingMap.put( "%A7", "�" );
+        decodingMap.put( "%A8", "�" );
+        decodingMap.put( "%A9", "�" );
+        decodingMap.put( "%AA", "�" );
+        decodingMap.put( "%AB", "�" );
+        decodingMap.put( "%AC", "�" );
+        decodingMap.put( "%AD", "�" );
+        decodingMap.put( "%AE", "�" );
+        decodingMap.put( "%AF", "�" );
+        decodingMap.put( "%B0", "�" );
+        decodingMap.put( "%B1", "�" );
+        decodingMap.put( "%B2", "�" );
+        decodingMap.put( "%B3", "�" );
+        decodingMap.put( "%B4", "�" );
+        decodingMap.put( "%B5", "�" );
+        decodingMap.put( "%B6", "�" );
+        decodingMap.put( "%B7", "�" );
+        decodingMap.put( "%B8", "�" );
+        decodingMap.put( "%B9", "�" );
+        decodingMap.put( "%BA", "�" );
+        decodingMap.put( "%BB", "�" );
+        decodingMap.put( "%BC", "�" );
+        decodingMap.put( "%BD", "�" );
+        decodingMap.put( "%BE", "�" );
+        decodingMap.put( "%BF", "�" );
+        decodingMap.put( "%C0", "�" );
+        decodingMap.put( "%C1", "�" );
+        decodingMap.put( "%C2", "�" );
+        decodingMap.put( "%C3", "�" );
+        decodingMap.put( "%C4", "�" );
+        decodingMap.put( "%C5", "�" );
+        decodingMap.put( "%C6", "�" );
+        decodingMap.put( "%C7", "�" );
+        decodingMap.put( "%C8", "�" );
+        decodingMap.put( "%C9", "�" );
+        decodingMap.put( "%CA", "�" );
+        decodingMap.put( "%CB", "�" );
+        decodingMap.put( "%CC", "�" );
+        decodingMap.put( "%CD", "�" );
+        decodingMap.put( "%CE", "�" );
+        decodingMap.put( "%CF", "�" );
+        decodingMap.put( "%D0", "�" );
+        decodingMap.put( "%D1", "�" );
+        decodingMap.put( "%D2", "�" );
+        decodingMap.put( "%D3", "�" );
+        decodingMap.put( "%D4", "�" );
+        decodingMap.put( "%D5", "�" );
+        decodingMap.put( "%D6", "�" );
         decodingMap.put( "%D7", " " );
-        decodingMap.put( "%D8", "Ø" );
-        decodingMap.put( "%D9", "Ù" );
-        decodingMap.put( "%DA", "Ú" );
-        decodingMap.put( "%DB", "Û" );
-        decodingMap.put( "%DC", "Ü" );
-        decodingMap.put( "%DD", "Ý" );
-        decodingMap.put( "%DE", "Þ" );
-        decodingMap.put( "%DF", "ß" );
-        decodingMap.put( "%E0", "à" );
-        decodingMap.put( "%E1", "á" );
-        decodingMap.put( "%E2", "â" );
-        decodingMap.put( "%E3", "ã" );
-        decodingMap.put( "%E4", "ä" );
-        decodingMap.put( "%E5", "å" );
-        decodingMap.put( "%E6", "æ" );
-        decodingMap.put( "%E7", "ç" );
-        decodingMap.put( "%E8", "è" );
-        decodingMap.put( "%E9", "é" );
-        decodingMap.put( "%EA", "ê" );
-        decodingMap.put( "%EB", "ë" );
-        decodingMap.put( "%EC", "ì" );
-        decodingMap.put( "%ED", "í" );
-        decodingMap.put( "%EE", "î" );
-        decodingMap.put( "%EF", "ï" );
-        decodingMap.put( "%F0", "ð" );
-        decodingMap.put( "%F1", "ñ" );
-        decodingMap.put( "%F2", "ò" );
-        decodingMap.put( "%F3", "ó" );
-        decodingMap.put( "%F4", "ô" );
-        decodingMap.put( "%F5", "õ" );
-        decodingMap.put( "%F6", "ö" );
-        decodingMap.put( "%F7", "÷" );
-        decodingMap.put( "%F8", "ø" );
-        decodingMap.put( "%F9", "ù" );
-        decodingMap.put( "%FA", "ú" );
-        decodingMap.put( "%FB", "û" );
-        decodingMap.put( "%FC", "ü" );
-        decodingMap.put( "%FD", "ý" );
-        decodingMap.put( "%FE", "þ" );
+        decodingMap.put( "%D8", "�" );
+        decodingMap.put( "%D9", "�" );
+        decodingMap.put( "%DA", "�" );
+        decodingMap.put( "%DB", "�" );
+        decodingMap.put( "%DC", "�" );
+        decodingMap.put( "%DD", "�" );
+        decodingMap.put( "%DE", "�" );
+        decodingMap.put( "%DF", "�" );
+        decodingMap.put( "%E0", "�" );
+        decodingMap.put( "%E1", "�" );
+        decodingMap.put( "%E2", "�" );
+        decodingMap.put( "%E3", "�" );
+        decodingMap.put( "%E4", "�" );
+        decodingMap.put( "%E5", "�" );
+        decodingMap.put( "%E6", "�" );
+        decodingMap.put( "%E7", "�" );
+        decodingMap.put( "%E8", "�" );
+        decodingMap.put( "%E9", "�" );
+        decodingMap.put( "%EA", "�" );
+        decodingMap.put( "%EB", "�" );
+        decodingMap.put( "%EC", "�" );
+        decodingMap.put( "%ED", "�" );
+        decodingMap.put( "%EE", "�" );
+        decodingMap.put( "%EF", "�" );
+        decodingMap.put( "%F0", "�" );
+        decodingMap.put( "%F1", "�" );
+        decodingMap.put( "%F2", "�" );
+        decodingMap.put( "%F3", "�" );
+        decodingMap.put( "%F4", "�" );
+        decodingMap.put( "%F5", "�" );
+        decodingMap.put( "%F6", "�" );
+        decodingMap.put( "%F7", "�" );
+        decodingMap.put( "%F8", "�" );
+        decodingMap.put( "%F9", "�" );
+        decodingMap.put( "%FA", "�" );
+        decodingMap.put( "%FB", "�" );
+        decodingMap.put( "%FC", "�" );
+        decodingMap.put( "%FD", "�" );
+        decodingMap.put( "%FE", "�" );
 
   }