add more item_name handling