Changes required to make templates available only after extraction is finished (TUI-84)