Fixing map
fix empty people object
Merge branch 'fix-empty-object'