diff --git a/refactoring.api/src/org/netbeans/modules/refactoring/spi/RefactoringElementsBag.java b/refactoring.api/src/org/netbeans/modules/refactoring/spi/RefactoringElementsBag.java
--- a/refactoring.api/src/org/netbeans/modules/refactoring/spi/RefactoringElementsBag.java
+++ b/refactoring.api/src/org/netbeans/modules/refactoring/spi/RefactoringElementsBag.java
@@ -105,7 +105,7 @@
             el.setStatus(el.READ_ONLY);
             delegate.add(el);
         //isQuery should be used
-        } else if (isGuarded(el) && !(refactoring instanceof WhereUsedQuery)) {
+        } else if (!(refactoring instanceof WhereUsedQuery) && isGuarded(el)) {
             ArrayList<RefactoringElementImplementation> proposedChanges = new ArrayList<RefactoringElementImplementation>();
             ArrayList<Transaction> transactions = new ArrayList<Transaction>();
             for (GuardedBlockHandler gbHandler: APIAccessor.DEFAULT.getGBHandlers(refactoring)) {
diff --git a/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/RefactoringPanel.java b/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/RefactoringPanel.java
--- a/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/RefactoringPanel.java
+++ b/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/RefactoringPanel.java
@@ -653,7 +653,7 @@
                             for (Iterator it = elements.iterator(); it.hasNext();i++) {
                                 RefactoringElement e = (RefactoringElement) it.next();
                                 createNode(TreeElementFactory.getTreeElement(e), nodes, root);
-                                PositionBounds pb = e.getPosition();
+                                PositionBounds pb = e.getPosition(); // ????
                                 if (pb != null) {
                                     CloneableEditorSupport ces = pb.getBegin().getCloneableEditorSupport();
                                     editorSupports.add(ces);
diff --git a/refactoring.java/src/org/netbeans/modules/refactoring/java/WhereUsedElement.java b/refactoring.java/src/org/netbeans/modules/refactoring/java/WhereUsedElement.java
--- a/refactoring.java/src/org/netbeans/modules/refactoring/java/WhereUsedElement.java
+++ b/refactoring.java/src/org/netbeans/modules/refactoring/java/WhereUsedElement.java
@@ -55,6 +55,7 @@
 import org.netbeans.modules.refactoring.java.ui.tree.ElementGripFactory;
 import org.openide.ErrorManager;
 import org.openide.filesystems.FileObject;
+import org.openide.filesystems.FileUtil;
 import org.openide.text.PositionBounds;
 import org.openide.loaders.DataObject;
 import org.openide.loaders.DataObjectNotFoundException;
@@ -66,9 +67,11 @@
 
 public class WhereUsedElement extends SimpleRefactoringElementImplementation {
     private PositionBounds bounds;
+    private int begin;
     private String displayText;
     private FileObject parentFile;
-    public WhereUsedElement(PositionBounds bounds, String displayText, FileObject parentFile, TreePath tp, CompilationInfo info) {
+    public WhereUsedElement(int begin, PositionBounds bounds, String displayText, FileObject parentFile, TreePath tp, CompilationInfo info) {
+        this.begin = begin;
         this.bounds = bounds;
         this.displayText = displayText;
         this.parentFile = parentFile;
@@ -81,13 +84,15 @@
     }
 
     public Lookup getLookup() {
-        Object composite = ElementGripFactory.getDefault().get(parentFile, bounds.getBegin().getOffset());
+//        Object composite = ElementGripFactory.getDefault().get(parentFile, bounds.getBegin().getOffset());
+        Object composite = ElementGripFactory.getDefault().get(parentFile, begin);
         if (composite==null) 
             composite = parentFile;
         return Lookups.singleton(composite);
     }
 
     public PositionBounds getPosition() {
+//        new Exception(FileUtil.getFileDisplayName(parentFile)).printStackTrace();
         return bounds;
     }
 
@@ -207,19 +212,21 @@
         sb.append("</b>");//NOI18N
         sb.append(RetoucheUtils.getHtml(trimEnd(content.subSequence(end, (int) en).toString())));
         
-        DataObject dob = null;
-        try {
-            dob = DataObject.find(compiler.getFileObject());
-        } catch (DataObjectNotFoundException ex) {
-            ex.printStackTrace();
-        }
-        CloneableEditorSupport ces = JavaWhereUsedQueryPlugin.findCloneableEditorSupport(dob);
-        PositionRef ref1 = ces.createPositionRef(start, Bias.Forward);
-        PositionRef ref2 = ces.createPositionRef(end, Bias.Forward);
-        PositionBounds bounds = new PositionBounds(ref1, ref2);
+//        DataObject dob = null;
+//        try {
+//            dob = DataObject.find(compiler.getFileObject());
+//        } catch (DataObjectNotFoundException ex) {
+//            ex.printStackTrace();
+//        }
+//        CloneableEditorSupport ces = JavaWhereUsedQueryPlugin.findCloneableEditorSupport(dob);
+//        PositionRef ref1 = ces.createPositionRef(start, Bias.Forward);
+//        PositionRef ref2 = ces.createPositionRef(end, Bias.Forward);
+//        PositionBounds bounds = new PositionBounds(ref1, ref2);
         TreePath tr = getEnclosingTree(tree);
         return new WhereUsedElement(
-                bounds,
+//                bounds,
+                start,
+                null,
                 start==end && anonClassNameBug128074 ? NbBundle.getMessage(UIUtilities.class, "LBL_AnonymousClass"):sb.toString().trim(),
                 compiler.getFileObject(),
                 tr,
@@ -264,17 +271,17 @@
         sb.append("</b>");//NOI18N
         sb.append(RetoucheUtils.getHtml(trimEnd(content.subSequence(end, (int) en).toString())));
         
-        DataObject dob = null;
-        try {
-            dob = DataObject.find(compiler.getFileObject());
-        } catch (DataObjectNotFoundException ex) {
-            ex.printStackTrace();
-        }
-        CloneableEditorSupport ces = JavaWhereUsedQueryPlugin.findCloneableEditorSupport(dob);
-        PositionRef ref1 = ces.createPositionRef(start, Bias.Forward);
-        PositionRef ref2 = ces.createPositionRef(end, Bias.Forward);
-        PositionBounds bounds = new PositionBounds(ref1, ref2);
-        return new WhereUsedElement(bounds, sb.toString().trim(), compiler.getFileObject(), null, compiler);
+//        DataObject dob = null;
+//        try {
+//            dob = DataObject.find(compiler.getFileObject());
+//        } catch (DataObjectNotFoundException ex) {
+//            ex.printStackTrace();
+//        }
+//        CloneableEditorSupport ces = JavaWhereUsedQueryPlugin.findCloneableEditorSupport(dob);
+//        PositionRef ref1 = ces.createPositionRef(start, Bias.Forward);
+//        PositionRef ref2 = ces.createPositionRef(end, Bias.Forward);
+//        PositionBounds bounds = new PositionBounds(ref1, ref2);
+        return new WhereUsedElement(start, null, sb.toString().trim(), compiler.getFileObject(), null, compiler);
     }
     
     
diff --git a/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/JavaWhereUsedQueryPlugin.java b/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/JavaWhereUsedQueryPlugin.java
--- a/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/JavaWhereUsedQueryPlugin.java
+++ b/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/JavaWhereUsedQueryPlugin.java
@@ -212,7 +212,9 @@
         fireProgressListenerStep(a.size());
         Problem problem = null;
         try {
+            long currentTimeMillis = System.currentTimeMillis();
             processFiles(a, new FindTask(elements));
+            System.out.println("----------FU.processFiles.end: " + (System.currentTimeMillis() - currentTimeMillis));
         } catch (IOException e) {
             problem = createProblemAndLog(null, e);
         }