Making count query less restrictive to avoid bucket issue