diff --git a/BookAStar/BookAStar/Pages/EstimatePages/BookQueriesPage.xaml.cs b/BookAStar/BookAStar/Pages/EstimatePages/BookQueriesPage.xaml.cs
index 2fe06982..909d3ca2 100644
--- a/BookAStar/BookAStar/Pages/EstimatePages/BookQueriesPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/EstimatePages/BookQueriesPage.xaml.cs
@@ -14,16 +14,30 @@ namespace BookAStar.Pages
         public BookQueriesPage()
         {
             InitializeComponent();
-            var model = new BookQueriesViewModel();
-            model.RefreshQueries =
-                new Command( () => {
-                    DataManager.Instance.BookQueries.Execute(null);
-                    this.list.EndRefresh();
-                });
-            
+            BindingContext = new BookQueriesViewModel();
+        }
+
+        public BookQueriesPage(BookQueriesViewModel model)
+        {
+            InitializeComponent();
             BindingContext = model;
         }
 
+        protected override void OnBindingContextChanged()
+        {
+            BookQueriesViewModel model = (BookQueriesViewModel) BindingContext;
+            if (model!=null)
+            {
+                model.RefreshQueries =
+                    new Command(() =>
+                    {
+                        DataManager.Instance.BookQueries.Execute(null);
+                        this.list.EndRefresh();
+                    });
+            }
+            base.OnBindingContextChanged();
+        }
+
         private void OnViewDetail(object sender, ItemTappedEventArgs e)
         {
             var item = e.Item as BookQueryViewModel;