refactored to use MapWithZeroDefault
resolved