Fix subquery alias for single-row subqueries in main query's select