refactor taxonomy list and mapping