Fixed Migration Problem

Also added urlchoice via migration