Fix table select