Issue #896384 by Yuriy Krysiuk, DamienMcKenna: Add extra fields to template output so they can be indexed