Update map id to be urlsafe instead of id
Fix completion call back signature. Move import