Fix Bug 920583, ensure all table header columns has appropriate scope

@AdrianGaudebert r?