improve context.labeled_uri non-controller uris support