Update taxonomy templates, fixes #5463