Fix problem with collections in embedded maps.

Fixed