Fix the selection list