--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/RiverAxisArtifact.java	Mon Jul 29 17:27:48 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/RiverAxisArtifact.java	Mon Jul 29 19:21:07 2013 +0200
@@ -91,6 +91,10 @@
             super(artifact);
         }
 
+        private boolean isUnofficial() {
+            return getIdPart(2) != null && !getIdPart(2).equals("1");
+        }
+
         @Override
         protected String getFacetType() {
             return FLOODMAP_RIVERAXIS;
@@ -98,12 +102,24 @@
 
         @Override
         protected String getLayer() {
+            if (isUnofficial()) {
+                return super.getLayer();
+            }
             return RiverFactory.getRiver(getRiverId()).getName();
         }
 
         @Override
         protected String getUrl() {
-            return RiverUtils.getRiverWMSUrl();
+            String kind = getIdPart(2);
+            logger.debug("Andre get url of river axis " + kind);
+
+            if (isUnofficial()) {
+                logger.debug("Returning as url: " + RiverUtils.getUserWMSUrl(artifact.identifier()));
+
+                return RiverUtils.getUserWMSUrl(artifact.identifier());
+            } else {
+                return RiverUtils.getRiverWMSUrl();
+            }
         }
 
         @Override