switched mappoint to id/tag combination