[TIDOC-1004] Missing a few fields