Fix star columns resolving to too many columns