Moved fieldset filling in scenario loop