Down to one query with proper eager loading