added pending improvements for edit templates for included related items