fixing issues with ItemMaps and state chaining