Is there a reason why you haven't updated the other templates too? I think we should make use of this globally defined array everywhere.