Adding Row count and sample count metric to queries