cpp: more Map fixes

Removed unordere_map: can't serialize it