Update _resolve_map to handle url suffix as well as id