diff --git a/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword (Development).xcscheme b/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword (Development).xcscheme
index 59535f3b..f9dc805b 100644
--- a/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword (Development).xcscheme	
+++ b/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword (Development).xcscheme	
@@ -44,7 +44,7 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "AppStore"
+      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       allowLocationSimulation = "YES">
diff --git a/MasterPassword/MPTypes.m b/MasterPassword/MPTypes.m
index c418e67f..c2be0baa 100644
--- a/MasterPassword/MPTypes.m
+++ b/MasterPassword/MPTypes.m
@@ -9,9 +9,9 @@
 #import "MPEntities.h"
 
 
-#define MP_N        131072
+#define MP_N        32768
 #define MP_r        8
-#define MP_p        1
+#define MP_p        2
 #define MP_dkLen    64
 #define MP_hash     PearlHashSHA256
 
diff --git a/MasterPassword/iOS/MPMainViewController.h b/MasterPassword/iOS/MPMainViewController.h
index daf51db9..d2345a71 100644
--- a/MasterPassword/iOS/MPMainViewController.h
+++ b/MasterPassword/iOS/MPMainViewController.h
@@ -14,7 +14,8 @@
 @interface MPMainViewController : UIViewController<MPTypeDelegate, UITextFieldDelegate, MPSearchResultsDelegate, UIWebViewDelegate, MFMailComposeViewControllerDelegate>
 
 @property (strong, nonatomic) MPElementEntity           *activeElement;
-@property (strong, nonatomic) IBOutlet MPSearchDelegate *searchResultsController;
+@property (strong, nonatomic) IBOutlet MPSearchDelegate *searchDelegate;
+@property (strong, nonatomic) IBOutlet UILongPressGestureRecognizer *resetPasswordCounterGesture;
 @property (weak, nonatomic) IBOutlet UITextField        *contentField;
 @property (weak, nonatomic) IBOutlet UIButton           *typeButton;
 @property (weak, nonatomic) IBOutlet UIWebView          *helpView;
@@ -33,7 +34,6 @@
 @property (weak, nonatomic) IBOutlet UIView             *searchTipContainer;
 @property (weak, nonatomic) IBOutlet UIView             *actionsTipContainer;
 @property (weak, nonatomic) IBOutlet UIView             *typeTipContainer;
-@property (strong, nonatomic) IBOutlet UILongPressGestureRecognizer *resetPasswordCounterGesture;
 
 @property (copy) void (^contentTipCleanup)(BOOL finished);
 
diff --git a/MasterPassword/iOS/MPMainViewController.m b/MasterPassword/iOS/MPMainViewController.m
index d9c1fe42..220fcdcf 100644
--- a/MasterPassword/iOS/MPMainViewController.m
+++ b/MasterPassword/iOS/MPMainViewController.m
@@ -25,7 +25,7 @@
 
 @implementation MPMainViewController
 @synthesize activeElement = _activeElement;
-@synthesize searchResultsController = _searchResultsController;
+@synthesize searchDelegate = _searchDelegate;
 @synthesize typeButton = _typeButton;
 @synthesize helpView = _helpView;
 @synthesize siteName = _siteName;
@@ -67,6 +67,15 @@
 }
 
 - (void)viewDidLoad {
+    
+    self.searchDelegate = [MPSearchDelegate new];
+    self.searchDelegate.delegate = self;
+    self.searchDelegate.searchDisplayController = self.searchDisplayController;
+    self.searchDelegate.searchTipContainer = self.searchTipContainer;
+    self.searchDisplayController.searchBar.delegate = self.searchDelegate;
+    self.searchDisplayController.delegate = self.searchDelegate;
+    self.searchDisplayController.searchResultsDelegate = self.searchDelegate;
+    self.searchDisplayController.searchResultsDataSource = self.searchDelegate;
 
     self.resetPasswordCounterGesture = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(resetPasswordCounter:)];
     [self.passwordIncrementer addGestureRecognizer:self.resetPasswordCounterGesture];
@@ -136,7 +145,6 @@
 
     [self setContentField:nil];
     [self setTypeButton:nil];
-    [self setSearchResultsController:nil];
     [self setHelpView:nil];
     [self setSiteName:nil];
     [self setPasswordCounter:nil];
@@ -153,6 +161,7 @@
     [self setSearchTipContainer:nil];
     [self setActionsTipContainer:nil];
     [self setTypeTipContainer:nil];
+    [self setSearchDelegate:nil];
     [self setResetPasswordCounterGesture:nil];
     [super viewDidUnload];
 }
diff --git a/MasterPassword/iOS/MPSearchDelegate.m b/MasterPassword/iOS/MPSearchDelegate.m
index 9bfe727b..419db494 100644
--- a/MasterPassword/iOS/MPSearchDelegate.m
+++ b/MasterPassword/iOS/MPSearchDelegate.m
@@ -110,7 +110,6 @@
 
 - (void)searchDisplayControllerWillEndSearch:(UISearchDisplayController *)controller {
 
-    dbg(@"Search ended with: %@", controller.searchBar.text);
     controller.searchBar.prompt                      = nil;
     controller.searchBar.searchResultsButtonSelected = NO;
 }
diff --git a/MasterPassword/iOS/MainStoryboard_iPhone.storyboard b/MasterPassword/iOS/MainStoryboard_iPhone.storyboard
index f4c63c6c..c89884d1 100644
--- a/MasterPassword/iOS/MainStoryboard_iPhone.storyboard
+++ b/MasterPassword/iOS/MainStoryboard_iPhone.storyboard
@@ -416,20 +416,10 @@ Your passwords will be AES-encrypted with your master password.</string>
         <scene sceneID="U26-Zf-euQ">
             <objects>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="mK2-p1-3zC" userLabel="First Responder" sceneMemberID="firstResponder"/>
-                <customObject id="0QO-2P-OhD" customClass="MPSearchDelegate">
-                    <connections>
-                        <outlet property="delegate" destination="PQa-Xl-A3x" id="O2f-mW-ab8"/>
-                        <outlet property="searchDisplayController" destination="P8c-gf-nN3" id="exk-dS-Ui3"/>
-                        <outlet property="searchTipContainer" destination="zOR-Du-qRL" id="lk6-2X-lIb"/>
-                    </connections>
-                </customObject>
                 <searchDisplayController id="P8c-gf-nN3">
                     <connections>
-                        <outlet property="delegate" destination="0QO-2P-OhD" id="gst-Hm-5ja"/>
                         <outlet property="searchBar" destination="qeo-n2-WVh" id="bFO-FC-Xdj"/>
                         <outlet property="searchContentsController" destination="PQa-Xl-A3x" id="iEu-t3-hJY"/>
-                        <outlet property="searchResultsDataSource" destination="0QO-2P-OhD" id="XJh-rC-kId"/>
-                        <outlet property="searchResultsDelegate" destination="0QO-2P-OhD" id="Bm8-Q3-lLA"/>
                     </connections>
                 </searchDisplayController>
                 <viewController id="PQa-Xl-A3x" customClass="MPMainViewController" sceneMemberID="viewController">
@@ -621,9 +611,6 @@ L4m3P4sSw0rD</string>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                 <gestureRecognizers/>
                                 <textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="URL"/>
-                                <connections>
-                                    <outlet property="delegate" destination="0QO-2P-OhD" id="Maj-Iz-6Hb"/>
-                                </connections>
                             </searchBar>
                             <view userInteractionEnabled="NO" contentMode="scaleToFill" id="zOR-Du-qRL">
                                 <rect key="frame" x="10" y="15" width="300" height="60"/>
@@ -734,7 +721,6 @@ L4m3P4sSw0rD</string>
                         <outlet property="passwordEdit" destination="9FS-fS-xH6" id="YeB-HF-ZPk"/>
                         <outlet property="passwordIncrementer" destination="jec-mu-nPt" id="i9B-lX-zzX"/>
                         <outlet property="searchDisplayController" destination="P8c-gf-nN3" id="CLs-YI-7NC"/>
-                        <outlet property="searchResultsController" destination="0QO-2P-OhD" id="xEC-gV-lHp"/>
                         <outlet property="searchTipContainer" destination="zOR-Du-qRL" id="X7h-Vh-iCE"/>
                         <outlet property="siteName" destination="gSK-aB-wNI" id="IIe-z8-zy8"/>
                         <outlet property="typeButton" destination="Cei-5z-uWE" id="4M1-d7-5Bh"/>
@@ -1379,6 +1365,7 @@ L4m3P4sSw0rD</string>
                 <relationship kind="outlet" name="passwordEdit" candidateClass="UIButton"/>
                 <relationship kind="outlet" name="passwordIncrementer" candidateClass="UIButton"/>
                 <relationship kind="outlet" name="resetPasswordCounterGesture" candidateClass="UILongPressGestureRecognizer"/>
+                <relationship kind="outlet" name="searchDelegate" candidateClass="MPSearchDelegate"/>
                 <relationship kind="outlet" name="searchResultsController" candidateClass="MPSearchDelegate"/>
                 <relationship kind="outlet" name="searchTipContainer" candidateClass="UIView"/>
                 <relationship kind="outlet" name="siteName" candidateClass="UILabel"/>