Fixed migrations to use settings for choices