update sample JSON and fix additional issue.