[development] re-arranging mutlivalue fields