Fixes on OrderType & PlanType Selection.