Follow-up clean up of dropdown migration

As a result of dropdown migration, there are still minor details that needs to be fixed

Details are in this discussion !131885 (comment 1577655947)