Link resolution for orgs; fixed model objects