fix(template) Fix modifier result handling

This avoids calling array_merge on what could be a generator.
It also changes a bit the logic behind modifier system

issue #5882