diff --git a/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/AS4EndpointDetailProviderPeppol.java b/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/AS4EndpointDetailProviderPeppol.java
index d0d0437b0..0d85021ab 100644
--- a/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/AS4EndpointDetailProviderPeppol.java
+++ b/phase4-dynamic-discovery/src/main/java/com/helger/phase4/dynamicdiscovery/AS4EndpointDetailProviderPeppol.java
@@ -57,7 +57,7 @@
  */
 public class AS4EndpointDetailProviderPeppol implements IAS4EndpointDetailProvider
 {
-  public static final EMode DEFAULT_WILDCARD_SELECTION_MODE = EMode.WILDCARD_ONLY;
+  public static final EMode DEFAULT_WILDCARD_SELECTION_MODE = EMode.BUSDOX_THEN_WILDCARD;
   public static final ISMPTransportProfile DEFAULT_TRANSPORT_PROFILE = ESMPTransportProfile.TRANSPORT_PROFILE_PEPPOL_AS4_V2;
 
   private static final Logger LOGGER = LoggerFactory.getLogger (AS4EndpointDetailProviderPeppol.class);
@@ -304,9 +304,10 @@ public String getReceiverAPEndpointURL () throws Phase4Exception
   @Override
   public String toString ()
   {
-    return new ToStringGenerator (null).append ("ServiceMetadataProvider", m_aServiceMetadataProvider)
+    return new ToStringGenerator (null).append ("ServiceGroupProvider", m_aServiceGroupProvider)
+                                       .append ("ServiceMetadataProvider", m_aServiceMetadataProvider)
+                                       .append ("WildcardSelectionMode", m_eWildcardSelectionMode)
                                        .append ("TransportProfile", m_aTP)
-                                       .append ("EndpointSelectionMode", m_eWildcardSelectionMode)
                                        .appendIfNotNull ("Endpoint", m_aEndpoint)
                                        .getToString ();
   }