Fix table selection