fixed table selecting
Merge remote-tracking branch 'upstream/master' into ip1