diff --git a/lib/hammer_cli_katello/id_resolver.rb b/lib/hammer_cli_katello/id_resolver.rb
index 634ed075..31313d50 100644
--- a/lib/hammer_cli_katello/id_resolver.rb
+++ b/lib/hammer_cli_katello/id_resolver.rb
@@ -48,8 +48,12 @@ class IdResolver < HammerCLIForeman::IdResolver
     include HammerCLIKatello::SearchOptionsCreators
 
     # alias_method_chain :create_search_options, :katello_api
-    alias_method :create_search_options_without_katello_api, :create_search_options
-    alias_method :create_search_options, :create_search_options_with_katello_api
+    # alias_method :create_search_options_without_katello_api, :create_search_options
+    # alias_method :create_search_options, :create_search_options_with_katello_api
+    def create_search_options(options, resource, mode = nil)
+      # Use the inherited Foreman standard method
+      super
+    end
 
     def file_unit_id(options)
       if options['option_content_view_version_version']
diff --git a/lib/hammer_cli_katello/search_options_creators.rb b/lib/hammer_cli_katello/search_options_creators.rb
index 9418ac7e..1d0365a6 100644
--- a/lib/hammer_cli_katello/search_options_creators.rb
+++ b/lib/hammer_cli_katello/search_options_creators.rb
@@ -2,8 +2,7 @@
 
 module HammerCLIKatello
   module SearchOptionsCreators
-    include HammerCLIKatello::ForemanSearchOptionsCreators
-
+    #include HammerCLIKatello::ForemanSearchOptionsCreators
     def create_flatpak_remotes_search_options(options, _mode = nil)
       name = options[HammerCLI.option_accessor_name('name')]
       organization_id = options[HammerCLI.option_accessor_name("organization_id")] ||
@@ -24,21 +23,6 @@ def create_repository_sets_search_options(options, mode = nil)
       )
     end
 
-    def create_module_streams_search_options(options, mode = nil)
-      create_search_options_without_katello_api(options, api.resource(:module_streams), mode)
-        .merge(create_search_options(options, api.resource(:module_streams), mode))
-    end
-
-    def create_file_units_search_options(options, mode = nil)
-      create_search_options_without_katello_api(options, api.resource(:file_units), mode)
-        .merge(create_search_options(options, api.resource(:file_units), mode))
-    end
-
-    def create_content_view_filter_rules_search_options(options, mode = nil)
-      create_search_options_without_katello_api(
-        options, api.resource(:content_view_filter_rules), mode)
-    end
-
     def create_repositories_search_options(options, _mode = nil)
       name = options[HammerCLI.option_accessor_name("name")]
       names = options[HammerCLI.option_accessor_name("names")]