diff --git a/BookAStar/BookAStar.Droid/MainActivity.cs b/BookAStar/BookAStar.Droid/MainActivity.cs
index 85102521..11e58483 100644
--- a/BookAStar/BookAStar.Droid/MainActivity.cs
+++ b/BookAStar/BookAStar.Droid/MainActivity.cs
@@ -43,14 +43,11 @@ namespace BookAStar.Droid
             global::Xamarin.Forms.Forms.Init(this, bundle);
             global::Xamarin.FormsMaps.Init(this, bundle);
             LoadApplication(new App(this));
-            /*  var x = typeof(Themes.DarkThemeResources);
-              x = typeof(Themes.LightThemeResources);
-              x = typeof(Themes.Android.UnderlineEffect); */
-              
-            long cmdid = Intent.GetLongExtra("BookQueryId",0) ;
-            if (cmdid > 0) App.CurrentApp.ShowBookQuery(cmdid);
+            /* var x = typeof(Themes.DarkThemeResources);
+             x = typeof(Themes.LightThemeResources);
+             x = typeof(Themes.Android.UnderlineEffect); */
         }
-        
+
 
         public bool EnablePushNotifications(bool enable)
         {
@@ -116,7 +113,13 @@ namespace BookAStar.Droid
             long queryId = Intent.GetLongExtra("BookQueryId",0);
 
             if (queryId > 0)
-                App.CurrentApp.ShowBookQuery(queryId);
+            {
+                Task.Run(async () =>
+                {
+                    App.CurrentApp.ShowBookQuery(
+                       await DataManager.Current.BookQueries.Get(queryId));
+                });
+            }
         }
 
 
@@ -180,17 +183,15 @@ namespace BookAStar.Droid
                 return manager.FindAccountsForService(MainSettings.ApplicationName);
             });
         }
-
-        public void AddAccount()
-        {
-            var auth = new YaOAuth2Authenticator(
+        YaOAuth2Authenticator auth = new YaOAuth2Authenticator(
                             clientId: "d9be5e97-c19d-42e4-b444-0e65863b19e1",
                             clientSecret: "blouh",
                             scope: "profile",
                             authorizeUrl: new Uri("http://dev.pschneider.fr/authorize"),
                             redirectUrl: new Uri("http://dev.pschneider.fr/oauth/success"),
                             accessTokenUrl: new Uri("http://dev.pschneider.fr/token"));
-            auth.AllowCancel = false;
+        public void AddAccount()
+        {
             Intent loginIntent = auth.GetUI(this);
             var accStore = AccountStore.Create(this);
             auth.Completed += (sender, eventArgs) =>
@@ -272,7 +273,7 @@ namespace BookAStar.Droid
 
         private void Auth_Error(object sender, AuthenticatorErrorEventArgs e)
         {
-            throw new NotImplementedException("Auth_Error");
+            // TODO handle
         }
 
         public class GCMDeclaration : IGCMDeclaration
@@ -306,6 +307,7 @@ namespace BookAStar.Droid
             };
         }
 
+        [Obsolete("Use RemoteEntity to manage entities from API")]
         public TAnswer InvokeApi<TAnswer>(string method, object arg)
         {
             using (var m =
@@ -330,15 +332,19 @@ namespace BookAStar.Droid
             }
         }
 
-        public Xamarin.Forms.View CreateMarkdownView(string markdown)
+        public Xamarin.Forms.View CreateMarkdownView(string markdown, Action<string> update)
         {
-            var md = new MarkdownDeep.Markdown();
             var view = new Android.Webkit.WebView(Forms.Context);
-            //view.SetWebViewClient(new MarkdownRazorWebViewClient(Forms.Context));
+            var viewclient = new MarkdownWebViewClient(update);
+            view.SetWebViewClient(viewclient);
             var mde = new MarkdownEditor();
-            mde.Model = md.Transform(markdown);
+            if (markdown!=null)
+            {
+                var md = new MarkdownDeep.Markdown();
+                mde.Model = md.Transform(markdown);
+            }
             var html = mde.GenerateString();
-            
+            view.Settings.BuiltInZoomControls = true;
             view.Settings.JavaScriptEnabled = true;
             view.Settings.LoadsImagesAutomatically = true;
             view.Settings.SetAppCacheEnabled(true);
@@ -350,8 +356,6 @@ namespace BookAStar.Droid
             view.Settings.BlockNetworkLoads = false;
             view.LoadDataWithBaseURL("file:///android_asset/",
                 html, "text/html", "utf-8",null);
-            //view.LoadData(html, "text/html", "UTF-8");
-            // 
             
             return view.ToView();
         }