Small fixes
Fix table selection