diff --git a/get-info.js b/get-info.js
index c4b2fa4d..f47d4859 100644
--- a/get-info.js
+++ b/get-info.js
@@ -88,10 +88,11 @@ exports.getYTPlaylist = function(id, callback, url) {
 }
 
 exports.searchYT = function(terms, callback) {
+    var query = escape(terms.join("/"));
     getJSON({
         host: "gdata.youtube.com",
         port: 80,
-        path: "/feeds/api/videos/-/" + terms.join("/") + "?v=2&alt=json",
+        path: "/feeds/api/videos/-/" + query + "?v=2&alt=json",
         method: "GET",
         dataType: "jsonp",
         timeout: 1000}, callback);
diff --git a/package.json b/package.json
index 4ee9a007..700eb312 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "author": "Calvin Montgomery",
     "name": "CyTube",
     "description": "Online media synchronizer and chat",
-    "version": "1.1.5",
+    "version": "1.2.1",
     "repository": {
         "url": "http://github.com/calzoneman/sync"
     },
diff --git a/server.js b/server.js
index 89e5098f..697fd2c9 100644
--- a/server.js
+++ b/server.js
@@ -9,7 +9,7 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-const VERSION = "1.2.0";
+const VERSION = "1.2.1";
 
 var fs = require("fs");
 var Logger = require("./logger.js");
diff --git a/www/assets/js/functions.js b/www/assets/js/functions.js
index b30c0e5f..b76fd7bb 100644
--- a/www/assets/js/functions.js
+++ b/www/assets/js/functions.js
@@ -208,16 +208,19 @@ function formatChatMessage(data) {
         message.addClass("action");
         message[0].innerHTML = data.username + " " + data.msg;
     }
-    if(data.msgclass == "drink") {
+    else if(data.msgclass == "drink") {
         div.addClass("drink");
     }
-    if(data.msgclass == "shout") {
+    else if(data.msgclass == "shout") {
         message.addClass("shout");
         name.addClass("shout");
     }
-    if(data.modflair) {
+    else if(data.modflair) {
         name.addClass(getNameColor(data.modflair));
     }
+    else  {
+        message.addClass(data.msgclass);
+    }
     return div;
 }