Index: applications/editors/josm/plugins/utilsplugin2/build.xml
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/build.xml	(revision 27410)
+++ applications/editors/josm/plugins/utilsplugin2/build.xml	(revision 27417)
@@ -30,5 +30,5 @@
 <project name="utilsplugin2" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="Utilsplugin2: customzing shortcut problem solved"/>
+    <property name="commit.message" value="Utilsplugin2: shortcut confilct removed, fix NPE in OpenCustomURL config, added osm.mapki.com"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="4549"/>
Index: applications/editors/josm/plugins/utilsplugin2/nbproject/project.xml
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/nbproject/project.xml	(revision 27410)
+++ applications/editors/josm/plugins/utilsplugin2/nbproject/project.xml	(revision 27417)
@@ -12,4 +12,9 @@
             <folders>
                 <source-folder>
+                    <label>utilsplugin2</label>
+                    <location>.</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
                     <label>src</label>
                     <type>java</type>
@@ -17,9 +22,7 @@
                     <encoding>UTF-8</encoding>
                 </source-folder>
-                <source-folder>
-                    <label>utilsplugin2</label>
-                    <location>.</location>
-                    <encoding>UTF-8</encoding>
-                </source-folder>
+                <build-file>
+                    <location>../../dist/utilsplugin2.jar</location>
+                </build-file>
             </folders>
             <ide-actions>
@@ -65,4 +68,5 @@
                 </context-menu>
             </view>
+            <subprojects/>
         </general-data>
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3">
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/UtilsPluginPreferences.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/UtilsPluginPreferences.java	(revision 27410)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/UtilsPluginPreferences.java	(revision 27417)
@@ -58,9 +58,9 @@
         // FIXME: get rid of hardcoded URLS
         List<String> items = (List<String>) Main.pref.getCollection("utilsplugin2.urlHistory");
-        if (items==null) {
+        String addr = Main.pref.get("utilsplugin2.customurl", defaultURL);
+        table=new JTable(new DefaultTableModel(null,new String[]{"Title","URL"}));
+        if (addr==null || items==null || items.isEmpty()) {
             items = resetURLList();
-            fillRows(items);
-        }
-        String addr = Main.pref.get("utilsplugin2.customurl", defaultURL);
+        }
         //System.out.println("pref:"+addr);
         
@@ -86,5 +86,4 @@
         });
         
-        table=new JTable(new DefaultTableModel(null,new String[]{"Title","URL"}));
         fillRows(items);
         
@@ -169,4 +168,6 @@
             items.add("AMDMi3 Russian streets");
             items.add("http://addresses.amdmi3.ru/?zoom=11&lat={#lat}&lon={#lon}&layers=B00");
+            items.add("Mapki - More  History with CT");
+            items.add("http://osm.mapki.com/history/{#type}.php?id={#id}");
             items.add("Element history [demo, =Ctrl-Shift-H]");
             items.add("http://www.openstreetmap.org/browse/{#type}/{#id}/history");
@@ -174,4 +175,5 @@
             items.add("http://www.openstreetmap.org/browse/{#type}/{#id}");
         Main.pref.putCollection("utilsplugin2.urlHistory",items);
+        Main.pref.put("utilsplugin2.customurl",items.get(4));
         return items;
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/SplitOnIntersectionsAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/SplitOnIntersectionsAction.java	(revision 27410)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/SplitOnIntersectionsAction.java	(revision 27417)
@@ -27,5 +27,5 @@
         super(TITLE, "dumbutils/splitonintersections", tr("Split adjacent ways on T-intersections"),
                 Shortcut.registerShortcut("tools:splitonintersections", tr("Tool: {0}", TITLE), KeyEvent.VK_P,
-                Shortcut.GROUP_EDIT, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK), true);
+                Shortcut.GROUP_MENU, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK| KeyEvent.SHIFT_DOWN_MASK), true);
     }
 
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/UnselectNodesAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/UnselectNodesAction.java	(revision 27410)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/UnselectNodesAction.java	(revision 27417)
@@ -24,5 +24,5 @@
                 tr("Removes all nodes from selection"),
                 Shortcut.registerShortcut("tools:unsnodes", tr("Tool: {0}","Unselect nodes"),
-                KeyEvent.VK_U, Shortcut.GROUP_EDIT, KeyEvent.ALT_DOWN_MASK), true);
+                KeyEvent.VK_U, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
         putValue("help", ht("/Action/UnselectNodes"));
     }