diff --git a/source/java/org/alfresco/repo/virtual/store/VirtualStoreImpl.java b/source/java/org/alfresco/repo/virtual/store/VirtualStoreImpl.java
index 2198b0dfbc..c4346da8f0 100644
--- a/source/java/org/alfresco/repo/virtual/store/VirtualStoreImpl.java
+++ b/source/java/org/alfresco/repo/virtual/store/VirtualStoreImpl.java
@@ -546,8 +546,8 @@ public class VirtualStoreImpl implements VirtualStore, VirtualFolderDefinitionRe
                     true,
                     true,
                     null,
-                    Collections.<QName> emptySet(),
                     searchTypeQNames,
+                    Collections.<QName> emptySet(),
                     ignoreAspectQNames,
                     sortProps,
                     pagingRequest);
diff --git a/source/java/org/alfresco/repo/virtual/template/VirtualQueryImpl.java b/source/java/org/alfresco/repo/virtual/template/VirtualQueryImpl.java
index 0dba0fd540..40ac19c487 100644
--- a/source/java/org/alfresco/repo/virtual/template/VirtualQueryImpl.java
+++ b/source/java/org/alfresco/repo/virtual/template/VirtualQueryImpl.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 
 package org.alfresco.repo.virtual.template;
 
@@ -93,7 +93,7 @@ public class VirtualQueryImpl implements VirtualQuery
      */
     @Override
     public PagingResults<Reference> perform(ActualEnvironment environment, boolean files, boolean folders,
-                String pattern, Set<QName> ignoreTypeQNames, Set<QName> searchTypeQNames, Set<QName> ignoreAspectQNames,
+                String pattern, Set<QName> searchTypeQNames, Set<QName> ignoreTypeQNames, Set<QName> ignoreAspectQNames,
                 List<Pair<QName, Boolean>> sortProps, PagingRequest pagingRequest, Reference parentReference)
                 throws VirtualizationException
     {
diff --git a/source/test-java/org/alfresco/repo/thumbnail/ThumbnailServiceImplTest.java b/source/test-java/org/alfresco/repo/thumbnail/ThumbnailServiceImplTest.java
index 8eb696ebc1..7b243ed50a 100644
--- a/source/test-java/org/alfresco/repo/thumbnail/ThumbnailServiceImplTest.java
+++ b/source/test-java/org/alfresco/repo/thumbnail/ThumbnailServiceImplTest.java
@@ -651,10 +651,10 @@ public class ThumbnailServiceImplTest extends BaseAlfrescoSpringTest
     /**
      * A simple listener which will delete the given node after the transition is completed
      */
-    private class CustomListener extends TransactionListenerAdapter
+    private class TestNodeDeleterListener extends TransactionListenerAdapter
     {
         private final NodeRef nodeRef;
-        private CustomListener(NodeRef nodeRef)
+        private TestNodeDeleterListener(NodeRef nodeRef)
         {
             this.nodeRef = nodeRef;
         }
@@ -736,9 +736,9 @@ public class ThumbnailServiceImplTest extends BaseAlfrescoSpringTest
             public Void execute() throws Throwable
             {
                 // Delete the content node (pdfOrig) before the afterCommit code is executed
-                CustomListener customListener = new CustomListener(pdfOrig);
-                // I needs to have a higher priority as the implemented afterCommit. The priority in order are (0,1,2,3,4)
-                AlfrescoTransactionSupport.bindListener(customListener, 1);
+                TestNodeDeleterListener testNodeDeleterListener = new TestNodeDeleterListener(pdfOrig);
+                // It needs to have a higher priority as the implemented afterCommit. The priority in order are (0,1,2,3,4)
+                AlfrescoTransactionSupport.bindListener(testNodeDeleterListener, 1);
 
                 thumbnailService.createThumbnail(pdfOrig, ContentModel.PROP_CONTENT, MimetypeMap.MIMETYPE_IMAGE_JPEG, details.getTransformationOptions(), "doclib");
                 return null;
diff --git a/source/test-java/org/alfresco/repo/virtual/template/VirtualQueryImplTest.java b/source/test-java/org/alfresco/repo/virtual/template/VirtualQueryImplTest.java
index 34f31c7b7c..e1c6d9ce6c 100644
--- a/source/test-java/org/alfresco/repo/virtual/template/VirtualQueryImplTest.java
+++ b/source/test-java/org/alfresco/repo/virtual/template/VirtualQueryImplTest.java
@@ -180,8 +180,8 @@ public class VirtualQueryImplTest extends TestCase
                       true,
                       true,
                       null,
-                      Collections.singleton(testQName2),
                       Collections.<QName> emptySet(),
+                      Collections.singleton(testQName2),
                       Collections.singleton(testQName1),
                       Arrays.asList(withSortDefinitions),
                       null,
@@ -197,8 +197,8 @@ public class VirtualQueryImplTest extends TestCase
                       false,
                       true,
                       null,
-                      Collections.singleton(testQName2),
                       Collections.<QName> emptySet(),
+                      Collections.singleton(testQName2),
                       Collections.singleton(testQName1),
                       Collections.<Pair<QName, Boolean>> emptyList(),
                       null,