[BUG #8321] Fixed table selection