Some mods to the results & results2 templates