Allow any id field to be used as the primary key in the admin
(instead of explicitly relying on "id")
Fix adorned target ordering