Fixing display of templates after reset

Change-Id: Ie6a4f672f88555f8ce77e21cae296bb8e9a39652