expanded wildcard
removed address columns