diff --git a/src/App1/Resources/menu/group.xml b/src/App1/Resources/menu/group.xml
new file mode 100644
index 00000000..43ceeb6b
--- /dev/null
+++ b/src/App1/Resources/menu/group.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/search"
+        android:icon="@android:drawable/ic_menu_search"
+        android:title="Search"
+        android:showAsAction="ifRoom"
+        android:actionViewClass="android.widget.SearchView" 
+    />
+    
+</menu>
diff --git a/src/App1/Resources/xml/searchable_app1.xml b/src/App1/Resources/xml/searchable_app1.xml
new file mode 100644
index 00000000..700b1a59
--- /dev/null
+++ b/src/App1/Resources/xml/searchable_app1.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+
+        android:label="@string/search_label"
+    android:hint="@string/search_hint" 
+    android:searchMode="showSearchLabelAsBadge"
+        android:searchSuggestAuthority="App1.SearchProvider"
+    android:searchSuggestSelection=" ?"
+    android:searchSuggestThreshold="2"
+    android:searchSuggestIntentAction="android.intent.action.VIEW"
+    android:searchSuggestIntentData="content://keepass2android.EntryActivity"
+
+        >
+ </searchable>
diff --git a/src/keepass2android/GroupActivity.cs b/src/keepass2android/GroupActivity.cs
index 753494e0..98cd9e25 100644
--- a/src/keepass2android/GroupActivity.cs
+++ b/src/keepass2android/GroupActivity.cs
@@ -31,6 +31,8 @@ namespace keepass2android
 {
 	[Activity (Label = "@string/app_name", ConfigurationChanges=ConfigChanges.Orientation|ConfigChanges.KeyboardHidden , Theme="@style/NoTitleBar")]		
 	[MetaData("android.app.default_searchable",Value="keepass2android.search.SearchResults")]
+	[IntentFilter(new string[]{"android.intent.action.SEARCH"})]
+	[MetaData("android.app.searchable",Resource=AppNames.Searchable)]
 	public class GroupActivity : GroupBaseActivity {
 		
 		public const int Uninit = -1;
diff --git a/src/keepass2android/GroupBaseActivity.cs b/src/keepass2android/GroupBaseActivity.cs
index f4e697a3..a287ba68 100644
--- a/src/keepass2android/GroupBaseActivity.cs
+++ b/src/keepass2android/GroupBaseActivity.cs
@@ -313,11 +313,11 @@ namespace keepass2android
 			inflater.Inflate(Resource.Menu.group, menu);
 			if (Util.HasActionBar(this))
 			{
-				var searchManager = (SearchManager) GetSystemService(SearchService);
+				var searchManager = (SearchManager)GetSystemService (Context.SearchService);
 				IMenuItem searchItem = menu.FindItem(Resource.Id.menu_search);
 				var searchView = (SearchView) searchItem.ActionView;
 				
-				searchView.SetSearchableInfo(searchManager.GetSearchableInfo(ComponentName));
+				searchView.SetSearchableInfo (searchManager.GetSearchableInfo (ComponentName));
 				searchView.SetOnSuggestionListener(new SuggestionListener(searchView.SuggestionsAdapter, this, searchItem));
 				searchView.SetOnQueryTextListener(new OnQueryTextListener(this));
 			}
diff --git a/src/keepass2android/Properties/AndroidManifest_net.xml b/src/keepass2android/Properties/AndroidManifest_net.xml
index f77e043d..04718299 100644
--- a/src/keepass2android/Properties/AndroidManifest_net.xml
+++ b/src/keepass2android/Properties/AndroidManifest_net.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 
-			android:versionCode="56" 
-			android:versionName="0.9.8 preview 1" 
+			android:versionCode="58" 
+			android:versionName="0.9.8" 
 			package="keepass2android.keepass2android" 
 			android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml
index faa47f8a..3189449d 100644
--- a/src/keepass2android/Resources/values/strings.xml
+++ b/src/keepass2android/Resources/values/strings.xml
@@ -540,7 +540,7 @@
 		* Changed password font\n
 		* Allow to change Dropbox account\n
 		* Fixed bug: Now remembering OTP password\n
-		* more to come\n
+		* Note: I have promised Material Design for this release. I am constantly working on it, but it needs a bit more time. Sorry! \n
 	</string>
 
 	<string name="ChangeLog_0_9_7b">
diff --git a/src/keepass2android/keepass2android.csproj b/src/keepass2android/keepass2android.csproj
index e1dbffa4..180b4daa 100644
--- a/src/keepass2android/keepass2android.csproj
+++ b/src/keepass2android/keepass2android.csproj
@@ -36,26 +36,24 @@
       </CustomCommands>
     </CustomCommands>
     <EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
-    <AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis>
-    <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
-    <AndroidLinkSkip />
-    <BundleAssemblies>False</BundleAssemblies>
-    <AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
-    <AndroidStoreUncompressedFileExtensions />
-    <MandroidI18n />
-    <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
-    <JavaOptions />
-    <MonoDroidExtraArgs />
+    <AndroidLinkSkip>
+    </AndroidLinkSkip>
+    <AndroidStoreUncompressedFileExtensions>
+    </AndroidStoreUncompressedFileExtensions>
+    <JavaOptions>
+    </JavaOptions>
+    <MonoDroidExtraArgs>
+    </MonoDroidExtraArgs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
+    <DebugType>full</DebugType>
     <Optimize>True</Optimize>
     <OutputPath>bin\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
     <ConsolePause>False</ConsolePause>
-    <AndroidSupportedAbis>armeabi,armeabi-v7a</AndroidSupportedAbis>
+    <AndroidSupportedAbis>armeabi;armeabi-v7a</AndroidSupportedAbis>
     <CustomCommands>
       <CustomCommands>
         <Command type="BeforeBuild" command="UseManifestNet.bat" />
@@ -65,10 +63,6 @@
     <DefineConstants>RELEASE</DefineConstants>
     <AndroidLinkSkip>System.Core%3b</AndroidLinkSkip>
     <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
-    <AndroidStoreUncompressedFileExtensions>
-    </AndroidStoreUncompressedFileExtensions>
-    <JavaOptions>
-    </JavaOptions>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseNoNet|AnyCPU' ">
     <DebugType>none</DebugType>
diff --git a/src/keepass2android/search/SearchProvider.cs b/src/keepass2android/search/SearchProvider.cs
index b832f6bb..a70deeee 100644
--- a/src/keepass2android/search/SearchProvider.cs
+++ b/src/keepass2android/search/SearchProvider.cs
@@ -33,7 +33,7 @@ using System.Collections.Generic;
 
 namespace keepass2android.search
 {
-	[ContentProvider(new [] { SearchProvider.Authority })]
+	[ContentProvider(new [] { SearchProvider.Authority}, Exported=false )]
 	public class SearchProvider : ContentProvider
 	{
 		private enum UriMatches