diff --git a/code/model/Blog.php b/code/model/Blog.php
index e6305ba91..2d9fe51bf 100644
--- a/code/model/Blog.php
+++ b/code/model/Blog.php
@@ -801,20 +801,12 @@ public function getCurrentTag() {
 		 * @var Blog $dataRecord
 		 */
 		$dataRecord = $this->dataRecord;
-
-		// get the tag value and generate a URL Segment for it
-		// use the URL segment for searching
-		$tagvalue = $this->request->param('Tag');
-		if($tagvalue) {
-			$tempTag = new BlogTag();
-	                $tempTag->Title = $tagvalue;
-	                $tag = $tempTag->generateURLSegment();
-
+		$tag = $this->request->param('Tag');
+		if($tag) {
 			return $dataRecord->Tags()
-				->filter('URLSegment', $tag)
+				->filter('URLSegment', array($tag, rawurlencode($tag)))
 				->first();
 		}
-
 		return null;
 	}
 
@@ -847,18 +839,12 @@ public function getCurrentCategory() {
 		 * @var Blog $dataRecord
 		 */
 		$dataRecord = $this->dataRecord;
-
-		$categoryValue = $this->request->param('Category');
-
-		if($categoryValue) {
-			$tempCategory = new BlogCategory();
-			$tempCategory->Title = $categoryValue;
-			$category = $tempCategory->generateURLSegment();
+		$category = $this->request->param('Category');
+		if($category) {
 			return $dataRecord->Categories()
-				->filter('URLSegment', $category)
+				->filter('URLSegment', array($category, rawurlencode($category)))
 				->first();
 		}
-
 		return null;
 	}