Changes to retain option id when moving option up and down