Fix selection in modal for create/edit