Fix retaining option id when moving option up and down