remove taxonomy conflict, rearrange field order for admin

prepare for 1.2 release