DSSSM-364 #time 45m Resolving issues related to list/grid template rendering