diff --git a/KonaBot.xcworkspace/xcuserdata/alex_ling.xcuserdatad/UserInterfaceState.xcuserstate b/KonaBot.xcworkspace/xcuserdata/alex_ling.xcuserdatad/UserInterfaceState.xcuserstate
index b8fbf86..f0b653b 100644
Binary files a/KonaBot.xcworkspace/xcuserdata/alex_ling.xcuserdatad/UserInterfaceState.xcuserstate and b/KonaBot.xcworkspace/xcuserdata/alex_ling.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/KonaBot/Base.lproj/Main.storyboard b/KonaBot/Base.lproj/Main.storyboard
index 4f2100a..a965068 100644
--- a/KonaBot/Base.lproj/Main.storyboard
+++ b/KonaBot/Base.lproj/Main.storyboard
@@ -127,7 +127,7 @@
         <!--Search View Controller-->
         <scene sceneID="Ndm-nv-xUQ">
             <objects>
-                <viewController id="qX2-8t-910" customClass="SearchViewController" customModule="KonaBot" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="searchVC" id="qX2-8t-910" customClass="SearchViewController" customModule="KonaBot" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="vQ7-aI-Pnx"/>
                         <viewControllerLayoutGuide type="bottom" id="TVM-YQ-Ml5"/>
@@ -256,7 +256,7 @@
                                 <rect key="frame" x="0.0" y="92" width="600" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="xhV-l8-jZM" id="7z2-dg-8cf">
-                                    <rect key="frame" x="0.0" y="0.0" width="567" height="43.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="567" height="44"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Mw-tV-uwd">
@@ -280,7 +280,7 @@
                                 <rect key="frame" x="0.0" y="136" width="600" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="8Ji-7Y-hPc" id="LOM-7X-YEX">
-                                    <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LVA-Ah-IWO">
@@ -305,7 +305,7 @@
                                 <rect key="frame" x="0.0" y="180" width="600" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Mpo-Bp-Wud" id="8iE-iK-B0C">
-                                    <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cnZ-ns-f5p">
@@ -338,7 +338,7 @@
                                 <rect key="frame" x="0.0" y="224" width="600" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9rF-EQ-N4T" id="9qg-Vo-658">
-                                    <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="5SD-97-huZ">
@@ -410,7 +410,7 @@
                                 <rect key="frame" x="0.0" y="28" width="600" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="pJx-RT-cYV" id="YAe-CU-Zwh">
-                                    <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E4l-ky-JZZ">
@@ -482,6 +482,6 @@
         <image name="Home" width="30" height="30"/>
     </resources>
     <inferredMetricsTieBreakers>
-        <segue reference="gzH-KP-3rh"/>
+        <segue reference="7iG-pN-Fav"/>
     </inferredMetricsTieBreakers>
 </document>
diff --git a/KonaBot/SearchViewController.swift b/KonaBot/SearchViewController.swift
index 95ff7a3..db453cc 100644
--- a/KonaBot/SearchViewController.swift
+++ b/KonaBot/SearchViewController.swift
@@ -103,12 +103,6 @@ class SearchViewController: UIViewController, UISearchBarDelegate, KonaAPITagDel
 		var searchText = self.searchBar.text!
 		searchText = self.prepareSearchKeyword(searchText)
 		if (!searchText.isEmpty){
-			/*
-			if (searchText == "r18"){
-				self.toggleR18()
-				return
-			}
-			*/
 			self.keyword = searchText
 			self.handleSearch()
 		}
diff --git a/PostDetailTableViewController.swift b/PostDetailTableViewController.swift
index d02afff..b2a7197 100644
--- a/PostDetailTableViewController.swift
+++ b/PostDetailTableViewController.swift
@@ -131,11 +131,17 @@ class PostDetailTableViewController: UITableViewController, TagViewDelegate {
 	}
 	
 	func tagViewDidSelecteTag(tag: String?) {
+		let searchVC = UIStoryboard(name: "Main", bundle: nil).instantiateViewControllerWithIdentifier("searchVC") as! SearchViewController
+		self.parentVC.navigationController!.pushViewController(searchVC, animated: true)
+		searchVC.searchBar.text = tag
+		searchVC.searchBarSearchButtonClicked(searchVC.searchBar)
+		/*
 		self.parentVC.tabBarController?.selectedIndex = 1
 		let navigationVC = self.parentVC.tabBarController?.selectedViewController as! UINavigationController
 		navigationVC.popToRootViewControllerAnimated(false)
 		let searchVC = navigationVC.topViewController as! SearchViewController
 		searchVC.searchBar.text = tag
 		searchVC.searchBarSearchButtonClicked(searchVC.searchBar)
+		*/
 	}
 }