TEIIDDES-2295 couple more table viewer set-up fixes for windows selection issue.