diff --git a/app/src/main/groovy/jd/gui/view/component/panel/MainTabbedPanel.groovy b/app/src/main/groovy/jd/gui/view/component/panel/MainTabbedPanel.groovy
index 9ad317c..d27af12 100644
--- a/app/src/main/groovy/jd/gui/view/component/panel/MainTabbedPanel.groovy
+++ b/app/src/main/groovy/jd/gui/view/component/panel/MainTabbedPanel.groovy
@@ -134,7 +134,7 @@ class MainTabbedPanel extends TabbedPanel implements UriOpenable, PageChangeList
                     // Enable page changed event
                     pageChangedListenersEnabled = true
                     // Search & display sub tab
-                    page.openUri(uri)
+                    return page.openUri(uri)
                 }
                 return true
             } else {
diff --git a/app/src/main/groovy/jd/gui/view/component/panel/TreeTabbedPanel.groovy b/app/src/main/groovy/jd/gui/view/component/panel/TreeTabbedPanel.groovy
index 217647d..6232ff4 100644
--- a/app/src/main/groovy/jd/gui/view/component/panel/TreeTabbedPanel.groovy
+++ b/app/src/main/groovy/jd/gui/view/component/panel/TreeTabbedPanel.groovy
@@ -203,7 +203,12 @@ class TreeTabbedPanel extends JPanel implements UriGettable, UriOpenable, PageCh
             def childU = it.uri.toString()
 
             if (u.length() > childU.length()) {
-                return u.startsWith(childU) && (u.charAt(childU.length()) == '/')
+                if (u.startsWith(childU)) {
+                    char c = u.charAt(childU.length())
+                    return (c == '/') || (c == '!')
+                } else {
+                    return false
+                }
             } else {
                 return u.equals(childU)
             }
diff --git a/services/src/main/groovy/jd/gui/service/preferencespanel/ClassFileSaverPreferencesProvider.groovy b/services/src/main/groovy/jd/gui/service/preferencespanel/ClassFileSaverPreferencesProvider.groovy
index bcfd267..da95e7a 100644
--- a/services/src/main/groovy/jd/gui/service/preferencespanel/ClassFileSaverPreferencesProvider.groovy
+++ b/services/src/main/groovy/jd/gui/service/preferencespanel/ClassFileSaverPreferencesProvider.groovy
@@ -35,7 +35,7 @@ class ClassFileSaverPreferencesProvider extends JPanel implements PreferencesPan
         omitThisPrefixCheckBox = new JCheckBox("Omit the prefix 'this' if possible")
         realignLineNumbersCheckBox = new JCheckBox('Realign line numbers')
         writeDefaultConstructorCheckBox = new JCheckBox('Write default constructor')
-        writeLineNumbersCheckBox = new JCheckBox('Write line numbers')
+        writeLineNumbersCheckBox = new JCheckBox('Write original line numbers')
         writeMetadataCheckBox = new JCheckBox('Write metadata')
 
         add(escapeUnicodeCharactersCheckBox)