svir: export more indicator info; fix output lists of themes and subthemes