[IMP] re-arangement of type selection fields