Bug fixes supporting alternate templates for items