Sort out dropdown issue and model call mixup