#1277: #1267 and #1248: category update and remove fig

opened by njr2128