CA-150219: Fixed by removing the unnecessary fields for JA and ZHCN