[ORB-94] fixed handoff dropdowns