fix subject field issues