Added slightly more intelligent column support for multiple hosts