diff --git a/addons/FastWQ.py b/addons/FastWQ.py
index 3601126..51c329f 100644
--- a/addons/FastWQ.py
+++ b/addons/FastWQ.py
@@ -18,9 +18,10 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 from anki.hooks import addHook
+from anki.utils import isMac
 
 ############## other config here ##################
-shortcut = 'Ctrl+Q'
+shortcut = ('Ctrl+Alt' if isMac else 'Ctrl') + '+Q'
 ###################################################
 
 def start_here():
diff --git a/addons/fastwq/__init__.py b/addons/fastwq/__init__.py
index ff0264d..87c0443 100644
--- a/addons/fastwq/__init__.py
+++ b/addons/fastwq/__init__.py
@@ -126,7 +126,7 @@ def context_menu():
         """
         add context menu to webview
         """
-        submenu = menu.addMenu('FastWQ')
+        submenu = menu.addMenu(_('QUERY'))
         submenu.addAction(_('ALL_FIELDS'), lambda: query_from_editor_fields(web_view.editor), QKeySequence(my_shortcut))
         submenu.addAction(_('CURRENT_FIELDS'), 
             lambda: query_from_editor_fields(
diff --git a/addons/fastwq/gui/progress.py b/addons/fastwq/gui/progress.py
index d095cdd..cedb98e 100644
--- a/addons/fastwq/gui/progress.py
+++ b/addons/fastwq/gui/progress.py
@@ -76,6 +76,7 @@ class ProgressWindow(object):
         )
         self._update(label=number_info, value=words_number+skips_number+fails_number)
         self._win.adjustSize()
+        self.app.processEvents()
 
     def update_title(self, title):
         if self.abort():
diff --git a/addons/fastwq/query/__init__.py b/addons/fastwq/query/__init__.py
index 04313ec..3a37cb3 100644
--- a/addons/fastwq/query/__init__.py
+++ b/addons/fastwq/query/__init__.py
@@ -86,6 +86,7 @@ def query_from_editor_fields(editor, fields=None):
             fields
         )
     else:
+        editor.setNote(editor.note)
         query_all([editor.note], flush, fields)
         editor.setNote(editor.note, focus=True)
         editor.saveNow()
diff --git a/addons21/fastwq/__init__.py b/addons21/fastwq/__init__.py
index 2382ce0..f909626 100644
--- a/addons21/fastwq/__init__.py
+++ b/addons21/fastwq/__init__.py
@@ -18,10 +18,10 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 from anki.hooks import addHook
-
+from anki.utils import isMac
 
 ############## other config here ##################
-shortcut = 'Ctrl+Q'
+shortcut = ('Ctrl+Alt' if isMac else 'Ctrl') + '+Q'
 ###################################################
 
 
diff --git a/addons21/fastwq/common.py b/addons21/fastwq/common.py
index ff0264d..87c0443 100644
--- a/addons21/fastwq/common.py
+++ b/addons21/fastwq/common.py
@@ -126,7 +126,7 @@ def context_menu():
         """
         add context menu to webview
         """
-        submenu = menu.addMenu('FastWQ')
+        submenu = menu.addMenu(_('QUERY'))
         submenu.addAction(_('ALL_FIELDS'), lambda: query_from_editor_fields(web_view.editor), QKeySequence(my_shortcut))
         submenu.addAction(_('CURRENT_FIELDS'), 
             lambda: query_from_editor_fields(
diff --git a/addons21/fastwq/gui/progress.py b/addons21/fastwq/gui/progress.py
index d095cdd..cedb98e 100644
--- a/addons21/fastwq/gui/progress.py
+++ b/addons21/fastwq/gui/progress.py
@@ -76,6 +76,7 @@ class ProgressWindow(object):
         )
         self._update(label=number_info, value=words_number+skips_number+fails_number)
         self._win.adjustSize()
+        self.app.processEvents()
 
     def update_title(self, title):
         if self.abort():