Added empty item name string handling