Updated map item logic to use generated ids instead of the actual properties