disambiguate geometry column references