Merge pull request #14088 from manassolanki/item-fixes

more fixes for the item defaults