Updated related content fields in forms and templates