Better query stats