Fix to queries in RestClient

InABox.Core/MultiQuery/QueryDef.cs

@@ -6,12 +6,20 @@ namespace InABox.Clients
 
     public class QueryDef : IQueryDef
     {
-
         public QueryDef(Type type)
         {
             Type = type;
         }
 
+        public QueryDef(Type type, IFilter? filter = null, IColumns? columns = null, ISortOrder? sort = null, CoreRange? range = null)
+        {
+            Type = type;
+            Filter = filter;
+            Columns = columns;
+            SortOrder = sort;
+            Range = range;
+        }
+
         public Type Type { get; private set; }
         public IFilter? Filter { get; set; }
         public IColumns? Columns { get; set; }

InABox.Server/RestService.cs

@@ -71,7 +71,7 @@ namespace InABox.API
                     }
                     else
                     {
-                        queries.Add(key, Activator.CreateInstance(typeof(QueryDef<>).MakeGenericType(type), query.Filter, query.Columns, query.Sort) as IQueryDef);
+                        queries.Add(key, new QueryDef(type, query.Filter, query.Columns, query.Sort, null));
                     }
                 }
 

inabox.client.rest/InABox.Client.Rest/RestClient.cs

@@ -190,7 +190,7 @@ namespace InABox.Clients
             );
             var req = new RestRequest(cmd, Method.Post)
             {
-                Timeout = TimeSpan.FromMilliseconds(Timeout.Milliseconds),
+                Timeout = TimeSpan.FromMilliseconds(Timeout.TotalMilliseconds),
             };
             //Log("  * {0}{1}() Creating Uri, Client and RestRequest took {2}ms", Action, typeof(TEntity).Name, sw.ElapsedMilliseconds);
             //sw.Restart();