Now include all query results rather than just the first one. Fix suggested by Steve. This is needed for the group by functionality.