diff --git a/BookAStar/BookAStar/DataManager.cs b/BookAStar/BookAStar/DataManager.cs
index d499cc92..ffc2d78d 100644
--- a/BookAStar/BookAStar/DataManager.cs
+++ b/BookAStar/BookAStar/DataManager.cs
@@ -12,17 +12,24 @@ namespace BookAStar
 
     public class DataManager
     {
+        // TODO userinfo estimatetemplate rating service product tag   
         public RemoteEntity<BookQueryData, long> BookQueries { get; set; }
         public RemoteEntity<Estimate, long> Estimates { get; set; }
         public RemoteEntity<Blog, long> Blogspot { get; set; }
-
+        public static DataManager Current
+        {
+            get
+            {
+                return App.CurrentApp.DataManager;
+            }
+        }
         public DataManager()
         {
-            BookQueries = new RemoteEntity<BookQueryData, long>("bookqueries",
-                q => q.CommandId);
-            Estimates = new RemoteEntity<Estimate, long>("estimates",
+            BookQueries = new RemoteEntity<BookQueryData, long>("bookquery",
+                q => q.Id);
+            Estimates = new RemoteEntity<Estimate, long>("estimate",
                 x => x.Id);
-            Blogspot = new RemoteEntity<Blog, long>("blogspot", 
+            Blogspot = new RemoteEntity<Blog, long>("blog", 
                 x=>x.Id);
         }
         public async Task<BookQueryData> GetBookQuery(long bookQueryId)