Fix policy profile id and name order while creation