diff --git a/src/XmlContentTranslator/Main.cs b/src/XmlContentTranslator/Main.cs
index a1768c6..576893f 100644
--- a/src/XmlContentTranslator/Main.cs
+++ b/src/XmlContentTranslator/Main.cs
@@ -99,7 +99,7 @@ private bool OpenFirstXmlDocument(XmlDocument doc)
                         var treeNode = new TreeNode(childNode.Name);
                         treeNode.Tag = childNode;
                         treeView1.Nodes.Add(treeNode);
-                        if (childNode.ChildNodes.Count > 0 && !XmlUtils.IsTextNode(childNode))
+                        if (XmlUtils.IsParentElement(childNode))
                         {
                             ExpandNode(treeNode, childNode);
                         }
@@ -258,11 +258,9 @@ private void AddListViewItem(XmlNode node)
                 if (node.NodeType != XmlNodeType.Comment && node.NodeType != XmlNodeType.CDATA)
                 {
 
-                    ListViewItem item;
+                    var item = new ListViewItem(node.Name);
                     if (node.NodeType == XmlNodeType.Attribute)
-                        item = new ListViewItem("@" + node.Name);
-                    else
-                        item = new ListViewItem(node.Name);
+                        item.Name = "@" + item.Name;
                     item.Tag = node;
 
                     item.SubItems.Add(node.InnerText);
@@ -374,15 +372,12 @@ private void TreeView1AfterSelect(object sender, TreeViewEventArgs e)
 
         private void DeSelectListViewItems()
         {
-            var selectedItems = new List<ListViewItem>();
+            listViewLanguageTags.SelectedIndexChanged -= ListViewLanguageTagsSelectedIndexChanged;
             foreach (ListViewItem lvi in listViewLanguageTags.SelectedItems)
-            {
-                selectedItems.Add(lvi);
-            }
-            foreach (ListViewItem lvi in selectedItems)
             {
                 lvi.Selected = false;
             }
+            listViewLanguageTags.SelectedIndexChanged += ListViewLanguageTagsSelectedIndexChanged;
         }
 
         private void ListViewLanguageTagsSelectedIndexChanged(object sender, EventArgs e)
@@ -841,7 +836,7 @@ private void SaveAsToolStripMenuItemClick(object sender, EventArgs e)
             saveFileDialog1.Title = "Save language file as...";
             saveFileDialog1.DefaultExt = ".xml";
             saveFileDialog1.Filter = "Xml files|*.xml" + "|All files|*.*";
-            saveFileDialog1.Title = "Open language master file";
+            saveFileDialog1.Title = "Save as language master file";
             if (saveFileDialog1.ShowDialog() == DialogResult.OK)
             {
                 _secondLanguageFileName = saveFileDialog1.FileName;