diff --git a/app/models/additionals_query.rb b/app/models/additionals_query.rb
index 2be33675..4d01ce10 100644
--- a/app/models/additionals_query.rb
+++ b/app/models/additionals_query.rb
@@ -165,7 +165,7 @@ module AdditionalsQuery
 
     if Additionals.user_with_select2?
       add_available_filter 'watcher_id', order: position,
-                                         type: :watcher
+                                         type: :user_with_me
     else
       add_available_filter 'watcher_id', order: position,
                                          type: :list,
diff --git a/app/views/additionals/_body_bottom.html.slim b/app/views/additionals/_body_bottom.html.slim
index 14b4a1cb..7f1dbe14 100644
--- a/app/views/additionals/_body_bottom.html.slim
+++ b/app/views/additionals/_body_bottom.html.slim
@@ -13,7 +13,7 @@
                                     multiple: true,
                                     url: grouped_users_auto_completes_path(project_id: @project, with_ano: true, with_me: true)
 
-= additionals_transform_to_select2 'watcher',
+= additionals_transform_to_select2 'user_with_me',
                                     format_state: 'formatNameWithIcon',
                                     multiple: true,
                                     url: grouped_users_auto_completes_path(project_id: @project, with_me: true)
diff --git a/lib/additionals/patches/query_patch.rb b/lib/additionals/patches/query_patch.rb
index f3eaf690..14196efb 100644
--- a/lib/additionals/patches/query_patch.rb
+++ b/lib/additionals/patches/query_patch.rb
@@ -23,7 +23,7 @@ module Additionals
         operators_by_filter_type[:global_user] = operators_by_filter_type[:list_optional]
         operators_by_filter_type[:principal] = operators_by_filter_type[:list_optional]
         operators_by_filter_type[:user] = operators_by_filter_type[:list_optional]
-        operators_by_filter_type[:watcher] = operators_by_filter_type[:list_optional]
+        operators_by_filter_type[:user_with_me] = operators_by_filter_type[:list_optional]
       end
 
       class_methods do
@@ -61,7 +61,7 @@ module Additionals
 
         def initialize_user_values_for_select2(field, values)
           case @available_filters[field][:type]
-          when :principal, :user, :assignee, :issue_assignee, :author, :watcher, :global_user, :internal_user
+          when :principal, :user, :assignee, :issue_assignee, :author, :user_with_me, :global_user, :internal_user
             @available_filters[field][:values] = Principal.ids_to_names_with_ids values
           end
         end