Use the same logic in both places to look up by slug-or-pid.
Reintroduce method to set fields.
Merge pull request #743 from afred/cc-500-739-continued

Use the same logic in both places to look up by slug-or-pid.