Fixed defects related to add/ delete item/type