diff --git a/ZicMoove/ZicMoove.Droid/ZicMoove.Droid.csproj b/ZicMoove/ZicMoove.Droid/ZicMoove.Droid.csproj
index 4b56829f..21e18e8b 100644
--- a/ZicMoove/ZicMoove.Droid/ZicMoove.Droid.csproj
+++ b/ZicMoove/ZicMoove.Droid/ZicMoove.Droid.csproj
@@ -471,7 +471,6 @@
     <Compile Include="Markdown\MDWebView.cs" />
     <Compile Include="OAuth2\YaOAuth2Authenticator.cs" />
     <Compile Include="Rendering\ImageButtonRenderer.cs" />
-    <Compile Include="Rendering\YaSvgImageView.cs" />
     <Compile Include="Rendering\SvgRenderer.cs" />
     <Compile Include="Resources\Resource.Designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -479,7 +478,8 @@
     <Compile Include="Services\AccountChooserService.cs" />
     <Compile Include="Services\GCMHandlers\BookQueryGCMHandler.cs" />
     <Compile Include="Services\GCMHandlers\EstimateGCMHandler.cs" />
-    <Compile Include="Services\GCMHandlers\GCMessageHandler.cs" />
+    <Compile Include="Services\GCMHandlers\Abstract\GCMessageHandler.cs" />
+    <Compile Include="Services\GCMHandlers\HairCutQueryGCMHandler.cs" />
     <Compile Include="Services\YavscChooserTargetService.cs" />
     <Compile Include="Services\GcmListenerService.cs" />
     <Compile Include="Services\GcmRegistrationIntentService.cs" />
diff --git a/ZicMoove/ZicMoove/Pages/EstimatePages/BookQueryPage.xaml.cs b/ZicMoove/ZicMoove/Pages/EstimatePages/BookQueryPage.xaml.cs
index f217ad47..184ff4ca 100644
--- a/ZicMoove/ZicMoove/Pages/EstimatePages/BookQueryPage.xaml.cs
+++ b/ZicMoove/ZicMoove/Pages/EstimatePages/BookQueryPage.xaml.cs
@@ -67,8 +67,8 @@ namespace ZicMoove.Pages
             if (editEstimateViewModel == null)
             {
                 // First search for an existing estimate
-                editEstimateViewModel = DataManager.Instance.EstimationCache.FirstOrDefault(
-                    estimate=> estimate.Query.Id == bookQueryViewModel.Id
+                editEstimateViewModel = DataManager.Instance.EstimationCache.LocalGet(
+                     bookQueryViewModel.Id
                     );
                 if (editEstimateViewModel == null)
                 {