Revert "Add new functionality to get proper selected table"

This reverts commit 85c179e6a3cb5655776b3cb7282a31f01c2fa732.