#2 Maps mix key and value when stored

[Geraldo B. Xexéo]

Maps are mixing key and values. There are two points
where this is happening, probably due to copying and
pasting code from collection.

When storing, it is storing key when it should store value.

When recovering, it recovers key twice and no value.

Code was sent with these two fixes.