worldstate_picker: minor amendments