refactor subject fields.(DHH-422)