Adding Row count and sample count metric to queries
Fixed remote datastore thread not starting up