diff --git a/source/java/org/alfresco/service/cmr/search/SearchService.java b/source/java/org/alfresco/service/cmr/search/SearchService.java
index 16a1cae49b..f7c03cdb36 100644
--- a/source/java/org/alfresco/service/cmr/search/SearchService.java
+++ b/source/java/org/alfresco/service/cmr/search/SearchService.java
@@ -31,7 +31,6 @@ import org.alfresco.service.Auditable;
 import org.alfresco.service.PublicService;
 import org.alfresco.service.cmr.repository.InvalidNodeRefException;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.repository.Path;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.repository.XPathException;
 import org.alfresco.service.namespace.NamespacePrefixResolver;
@@ -133,7 +132,10 @@ public interface SearchService
      *            it follows all
      * @return a list of all the child assoc relationships to the selected nodes
      */
-    @Auditable(key = Auditable.Key.ARG_0, parameters = {"contextNodeRef", "xpath", "parameters", "namespacePrefixResolver", "followAllParentLinks"})
+    @Auditable(
+            key = Auditable.Key.ARG_0,
+            parameters = {"contextNodeRef", "xpath", "parameters", "namespacePrefixResolver", "followAllParentLinks"},
+            recordable = {true,             true,    true,         false,                     true})
     public List<NodeRef> selectNodes(NodeRef contextNodeRef, String xpath, QueryParameterDefinition[] parameters,
             NamespacePrefixResolver namespacePrefixResolver, boolean followAllParentLinks)
             throws InvalidNodeRefException, XPathException;
@@ -156,7 +158,10 @@ public interface SearchService
      *            the xpath variant
      * @return a list of all the child assoc relationships to the selected nodes
      */
-    @Auditable(key = Auditable.Key.ARG_0, parameters = {"contextNodeRef", "xpath", "parameters", "namespacePrefixResolver", "followAllParentLinks", "language"})
+    @Auditable(
+            key = Auditable.Key.ARG_0,
+            parameters = {"contextNodeRef", "xpath", "parameters", "namespacePrefixResolver", "followAllParentLinks", "language"},
+            recordable = {true,             true,    true,         false,                     true,                   true})
     public List<NodeRef> selectNodes(NodeRef contextNodeRef, String xpath, QueryParameterDefinition[] parameters,
             NamespacePrefixResolver namespacePrefixResolver, boolean followAllParentLinks, String language)
             throws InvalidNodeRefException, XPathException;
@@ -177,7 +182,10 @@ public interface SearchService
      *            it follows all
      * @return a list of property values
      */
-    @Auditable(key = Auditable.Key.ARG_0, parameters = {"contextNodeRef", "xpath", "parameters", "namespacePrefixResolver", "followAllParentLinks"})
+    @Auditable(
+            key = Auditable.Key.ARG_0,
+            parameters = {"contextNodeRef", "xpath", "parameters", "namespacePrefixResolver", "followAllParentLinks"},
+            recordable = {true,             true,    true,         false,                     true})
     public List<Serializable> selectProperties(NodeRef contextNodeRef, String xpath,
             QueryParameterDefinition[] parameters, NamespacePrefixResolver namespacePrefixResolver,
             boolean followAllParentLinks) throws InvalidNodeRefException, XPathException;
@@ -200,7 +208,10 @@ public interface SearchService
      *            the xpath variant
      * @return a list of property values
      */
-    @Auditable(key = Auditable.Key.ARG_0, parameters = {"contextNodeRef", "xpath", "parameters", "namespacePrefixResolver", "followAllParentLinks", "language"})
+    @Auditable(
+            key = Auditable.Key.ARG_0,
+            parameters = {"contextNodeRef", "xpath", "parameters", "namespacePrefixResolver", "followAllParentLinks", "language"},
+            recordable = {true,             true,     true,        false,                     true,                   true})
     public List<Serializable> selectProperties(NodeRef contextNodeRef, String xpath,
             QueryParameterDefinition[] parameters, NamespacePrefixResolver namespacePrefixResolver,
             boolean followAllParentLinks, String language) throws InvalidNodeRefException, XPathException;
diff --git a/source/java/org/alfresco/service/cmr/workflow/WorkflowService.java b/source/java/org/alfresco/service/cmr/workflow/WorkflowService.java
index 193887ca06..29a7166d10 100644
--- a/source/java/org/alfresco/service/cmr/workflow/WorkflowService.java
+++ b/source/java/org/alfresco/service/cmr/workflow/WorkflowService.java
@@ -57,7 +57,9 @@ public interface WorkflowService
      * @param  mimetype  the mimetype of the workflow definition
      * @return  workflow deployment descriptor
      */
-    @Auditable(parameters = {"engineId", "workflowDefinition", "mimetype"})
+    @Auditable(
+            parameters = {"engineId", "workflowDefinition", "mimetype"},
+            recordable = {true,       false,                true})
     public WorkflowDeployment deployDefinition(String engineId, InputStream workflowDefinition, String mimetype);
     
     /**
@@ -95,7 +97,9 @@ public interface WorkflowService
      * @param  mimetype  the mimetype of the definition
      * @return  true => already deployed
      */
-    @Auditable(parameters = {"engineId", "workflowDefinition", "mimetype"})
+    @Auditable(
+            parameters = {"engineId", "workflowDefinition", "mimetype"},
+            recordable = {true,       false,                true})
     public boolean isDefinitionDeployed(String engineId, InputStream workflowDefinition, String mimetype);
     
     /**