Improved subquery.