Only fetch y if needed

When group is not selected do not try to fetch y, as was the previous
behaviour