diff --git a/app/scripts/views/import-csv-view.js b/app/scripts/views/import-csv-view.js
index 0387a689..da25bfbb 100644
--- a/app/scripts/views/import-csv-view.js
+++ b/app/scripts/views/import-csv-view.js
@@ -123,11 +123,12 @@ class ImportCsvView extends View {
         this.groups = [];
         for (const file of this.appModel.files) {
             file.forEachGroup(group => {
-                let title = escape(group.title);
+                const title = group.title;
+                const spaces = [];
                 for (let parent = group; parent.parentGroup; parent = parent.parentGroup) {
-                    title = '  ' + title;
+                    spaces.push(' ', ' ');
                 }
-                this.groups.push({ id: group.id, fileId: file.id, title });
+                this.groups.push({ id: group.id, fileId: file.id, spaces, title });
             });
         }
     }
diff --git a/app/scripts/views/settings/settings-help-view.js b/app/scripts/views/settings/settings-help-view.js
index d76ab1eb..1acb49ab 100644
--- a/app/scripts/views/settings/settings-help-view.js
+++ b/app/scripts/views/settings/settings-help-view.js
@@ -1,7 +1,6 @@
 import { View } from 'framework/views/view';
 import { RuntimeInfo } from 'const/runtime-info';
 import { Links } from 'const/links';
-import { escape } from 'util/fn';
 import { Launcher } from 'comp/launcher';
 import template from 'templates/settings/settings-help.hbs';
 
@@ -30,7 +29,7 @@ class SettingsHelpView extends View {
                 encodeURIComponent('!please describe your issue here!\n\n' + appInfo),
             desktopLink: Links.Desktop,
             webAppLink: Links.WebApp,
-            appInfo: escape(appInfo)
+            appInfo
         });
     }
 }
diff --git a/app/templates/import-csv.hbs b/app/templates/import-csv.hbs
index 006c0c43..2b5ce420 100644
--- a/app/templates/import-csv.hbs
+++ b/app/templates/import-csv.hbs
@@ -57,7 +57,10 @@
             <select class="import-csv__target-select" id="import-csv__target-select">
                 <option value="" selected>{{res 'importNewFile'}}</option>
                 {{#each groups as |group|}}
-                    <option value="{{group.id}}" data-file="{{group.fileId}}">{{{group.title}}}</option>
+                    <option value="{{group.id}}" data-file="{{group.fileId}}">
+                        {{#if spaces}}{{#each spaces}}&nbsp;{{/each}}{{/if}}
+                        {{group.title}}
+                    </option>
                 {{/each}}
             </select>
         </div>