diff --git a/catalogTags.py b/catalogTags.py
index d99fd2d..367e765 100644
--- a/catalogTags.py
+++ b/catalogTags.py
@@ -1,12 +1,12 @@
 aircraftTypeTags = [
     "ga", "fighter", "helicopter", "glider", "spaceship", "bomber", "groundvehicle", 
-    "tanker", "cargo", "passenger", "bizjet", "trainer", "airship", "balloon"
+    "tanker", "cargo", "transport", "bizjet", "trainer", "airship", "balloon"
 ]
 
 manufacturerTags = [
     "boeing", "cessna", "diamond", "douglas", "bell", "piper", 
     "airbus", "vickers", "lockheed", "fokker",
-    "embrarer", "bombardier", "pilatus"
+    "embrarer", "bombardier", "pilatus", "robin"
 ]
 
 eraTags = [
@@ -62,7 +62,9 @@ propulsionTags = [
     "supercharged",
     "turboprop",
     "jet", "afterburner", "rocket",
-    "electric"
+    "electric",
+    "twin-engine",
+    "single-engine"
 ]
 
 simFeatureTags = [
diff --git a/sgprops.py b/sgprops.py
index 29a131d..ee280d0 100644
--- a/sgprops.py
+++ b/sgprops.py
@@ -159,11 +159,12 @@ class PropsHandler(handler.ContentHandler):
         if (name == 'PropertyList'):
             return
             
-        index = 0
         if 'n' in attrs.keys():
             index = int(attrs['n'])
+            self._current = self._current.getChild(name, index, create=True)
+        else:
+            self._current = self._current.addChild(name)
             
-        self._current = self._current.getChild(name, index, create=True)
             
         if 'include' in attrs.keys():
             self.handleInclude(attrs['include'])