Use * instead of primary alias in count queries with CTE

Use * instead of primary alias in count queries with CTE #7913