diff --git a/migrate.py b/migrate.py
index 5f381715..92e3f21e 100644
--- a/migrate.py
+++ b/migrate.py
@@ -83,6 +83,7 @@ def topics(export_topics, topics_by_slug, topics_by_oid, cats_data, tags_data):
 	if len(sys.argv) > 2: limit = int(sys.argv[2])
 	print('migrating %d topics...' % limit)
 	counter = 0
+	topics_by_title = {}
 	for tag in tags_data:
 		old_id = tag["createdBy"]
 		tag["createdBy"] = user_id_map.get(old_id, 0)
diff --git a/migration/content/.gitkeep b/migration/content/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/migration/content/article/.gitkeep b/migration/content/article/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/migration/content/image/.gitkeep b/migration/content/image/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/migration/content/music/.gitkeep b/migration/content/music/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/migration/content/prose/.gitkeep b/migration/content/prose/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/migration/content/video/.gitkeep b/migration/content/video/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/migration/tables/users.py b/migration/tables/users.py
index 69ee89d1..287d7814 100644
--- a/migration/tables/users.py
+++ b/migration/tables/users.py
@@ -34,7 +34,7 @@ def migrate(entry):
 	res['old_id'] = entry['_id']
 	res['password'] = entry['services']['password'].get('bcrypt', '')
 	del entry['services']
-	del entry['subscribedTo']
+	if entry.get('subscribedTo', '') != '': del entry['subscribedTo']
 	res['username'] = entry['emails'][0]['address']
 	res['email'] = res['username']
 	res['wasOnlineAt'] = parse(entry.get('loggedInAt', entry['createdAt']))