diff --git a/lib/mcollective/agent/rpcutil.ddl b/lib/mcollective/agent/rpcutil.ddl
index a252fb0..4f6c441 100644
--- a/lib/mcollective/agent/rpcutil.ddl
+++ b/lib/mcollective/agent/rpcutil.ddl
@@ -63,7 +63,7 @@ action "get_fact", :description => "Retrieve a single fact from the fact store"
            :type        => :string,
            :validation  => '^[\w\-\.]+$',
            :optional    => false,
-           :maxlength   => 40
+           :maxlength   => 256
 
      output :fact,
             :description => "The name of the fact being returned",
diff --git a/lib/mcollective/discovery/choria.rb b/lib/mcollective/discovery/choria.rb
index c935c05..fbea509 100644
--- a/lib/mcollective/discovery/choria.rb
+++ b/lib/mcollective/discovery/choria.rb
@@ -68,7 +68,7 @@ def discover_collective(filter)
       #
       # Nodes are searched using an `and` operator via the discover_classes method
       #
-      # When the `rpcutil` agent is required it will look for `Mcollective` class
+      # When the `rpcutil` or `scout` agent is required it will look for `Mcollective` class
       # otherwise `Mcollective_avent_agentname` thus it will only find plugins
       # installed using the `choria/mcollective` AIO plugin packager
       #
@@ -76,7 +76,7 @@ def discover_collective(filter)
       # @return [Array<String>] list of nodes found
       def discover_agents(filter)
         pql = filter.map do |agent|
-          if agent == "rpcutil"
+          if ["rpcutil", "scout"].include?(agent)
             discover_classes(["mcollective::service"])
           elsif agent =~ /^\/(.+)\/$/
             'resources {type = "File" and tag ~ "mcollective_agent_.*?%s.*?_server"}' % [string_regexi($1)]