Fixed problems with IDs in map demo