Fixes for error where the icon is not in the select box. And fixes where an Item originally does not have any geo types associated with it