diff --git a/avoid_views_plugin_query.inc b/avoid_views_plugin_query.inc
index d745eb9..32495f9 100644
--- a/avoid_views_plugin_query.inc
+++ b/avoid_views_plugin_query.inc
@@ -20,9 +20,11 @@ class avoid_views_plugin_query extends views_plugin_query_default {
   function avoid_handle_query($result) {
     $tables = array();
     $display_handler = $this->view->display_handler;
-    foreach (array('filters', 'sorts') as $option) {
+    foreach (array('filters', 'sorts', 'arguments', 'fields') as $option) {
       foreach ($display_handler->get_option($option) as $option_data) {
-        $tables[$option_data['table']] = $option_data['table'];
+        if ($option != 'fields' || !empty($option_data['group_type'])) {
+          $tables[$option_data['table']] = $option_data['table'];
+        }
       }
     }
     foreach ($this->table_queue as $table) {