Improve handling of '*' for joined tables