diff --git a/public/src/utils.js b/public/src/utils.js
index 7be7618225..356df294c3 100644
--- a/public/src/utils.js
+++ b/public/src/utils.js
@@ -127,7 +127,7 @@
 		},
 
 		removePunctuation: function(str) {
-			return str.replace(/[\.,-\/#!$%\^&\*;:{}=\-_`~()?]/g, '');
+			return str.replace(/[\.,-\/#!$%\^&\*;:{}=\-_`<>'"~()?]/g, '');
 		},
 
 		isEmailValid: function(email) {
diff --git a/src/topics.js b/src/topics.js
index 105a9f3e4a..2472dd3219 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -211,6 +211,9 @@ var async = require('async'),
 						return next(null, userCache[topicData.uid]);
 					}
 					user.getUserFields(topicData.uid, ['username', 'userslug', 'picture'], next);
+				},
+				tags: function(next) {
+					Topics.getTopicTagsObjects(topicData.tid, next);
 				}
 			}, function(err, topicInfo) {
 				if(err) {
@@ -234,6 +237,7 @@ var async = require('async'),
 				topicData.category = topicInfo.categoryData;
 				topicData.teaser = topicInfo.teaser;
 				topicData.user = topicInfo.user;
+				topicData.tags = topicInfo.tags;
 
 				next(null, topicData);
 			});