Templates update to support rate labels