fix re-ordering issue. fix pre-selected priority