keywords -> JudgmentItem and other corrections