Fix inclusion and exclusion of aliased columns