diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
index 3783c91586..19cced24a8 100644
--- a/demos/CMakeLists.txt
+++ b/demos/CMakeLists.txt
@@ -1,4 +1,4 @@
-install(DIRECTORY ecc83 electric flat_hierarchy interf_u microwave
+install(DIRECTORY complex_hierarchy ecc83 electric flat_hierarchy interf_u microwave
                   pic_programmer pspice "sonde xilinx" test_xil_95108 video
         DESTINATION ${KICAD_DEMOS}
         COMPONENT resources
diff --git a/eeschema/class_sch_cmp_field.cpp b/eeschema/class_sch_cmp_field.cpp
index 493c54854f..6211046ccb 100644
--- a/eeschema/class_sch_cmp_field.cpp
+++ b/eeschema/class_sch_cmp_field.cpp
@@ -434,14 +434,14 @@ bool SCH_FIELD::Matches( wxFindReplaceData& aSearchData, void * aAuxData )
             int part_id = pSch->GetUnitSelection( sheet );
     #if defined(KICAD_GOST)
             fulltext.Append( '.' );
-            part_id = '1' - 1 + part_id;
+            part_id += '1' - 1;
     #else
-            part_id = 'A' - 1 + part_id;
+            part_id += 'A' - 1;
     #endif
-            fulltext.Append( part_id );
+            fulltext.Append( (char)part_id );
         }
         return SCH_ITEM::Matches( fulltext, aSearchData );
     }
-    
+
     return SCH_ITEM::Matches( m_Text, aSearchData );
 }