diff --git a/bin/mpw-delete b/bin/mpw-delete
index e2d1195..d0e76d5 100644
--- a/bin/mpw-delete
+++ b/bin/mpw-delete
@@ -25,6 +25,7 @@ require 'mpw/cli'
 # --------------------------------------------------------- #
 
 options = {}
+values  = {}
 
 OptionParser.new do |opts|
 	opts.banner = "#{I18n.t('option.usage')}: mpw delete [options]"
@@ -34,7 +35,7 @@ OptionParser.new do |opts|
 	end
 
 	opts.on('-g', '--group NAME', I18n.t('option.group')) do |group|
-		options[:group] = group
+		values[:group] = group
 	end
 
 	opts.on('-h', '--help', I18n.t('option.help')) do
@@ -43,7 +44,7 @@ OptionParser.new do |opts|
 	end
 
 	opts.on('-p', '--pattern PATTERN', I18n.t('option.pattern')) do |pattern|
-		options[:pattern] = pattern
+		values[:pattern] = pattern
 	end
 
 	opts.on('-w', '--wallet NAME', I18n.t('option.wallet')) do |wallet|
@@ -54,11 +55,7 @@ end.parse!
 config = MPW::Config.new(options[:config])
 cli    = MPW::Cli.new(config, options[:sync])
 
-opts = { search: options[:pattern],
-         group:  options[:group],
-       }
-
 cli.load_config
 cli.get_wallet(options[:wallet])
 cli.decrypt
-cli.delete(opts)
+cli.delete(values)
diff --git a/bin/mpw-export b/bin/mpw-export
index be15bb5..f5a2145 100644
--- a/bin/mpw-export
+++ b/bin/mpw-export
@@ -25,6 +25,7 @@ require 'mpw/cli'
 # --------------------------------------------------------- #
 
 options = {}
+values  = {}
 
 OptionParser.new do |opts|
 	opts.banner = "#{I18n.t('option.usage')}: mpw wallet [options]"
@@ -38,7 +39,7 @@ OptionParser.new do |opts|
 	end
 
 	opts.on('-g', '--group GROUP', I18n.t('option.group')) do |group|
-		options[:group] = group
+		values[:group] = group
 	end
 
 	opts.on('-h', '--help', I18n.t('option.help')) do
@@ -47,7 +48,7 @@ OptionParser.new do |opts|
 	end
 
 	opts.on('-p', '--pattern PATTERN', I18n.t('option.pattern')) do |pattern|
-		options[:pattern] = pattern
+		values[:pattern] = pattern
 	end
 
 	opts.on('-w', '--wallet NAME', I18n.t('option.wallet')) do |wallet|
@@ -58,11 +59,7 @@ end.parse!
 config = MPW::Config.new(options[:config])
 cli    = MPW::Cli.new(config, options[:sync])
 
-opts = { search: options[:pattern],
-         group:  options[:group],
-       }
-
 cli.load_config
 cli.get_wallet(options[:wallet])
 cli.decrypt
-cli.export(options[:file], opts)
+cli.export(options[:file], values)
diff --git a/bin/mpw-list b/bin/mpw-list
index 1c729cc..839e00f 100644
--- a/bin/mpw-list
+++ b/bin/mpw-list
@@ -25,6 +25,7 @@ require 'mpw/cli'
 # --------------------------------------------------------- #
 
 options = {}
+values  = {}
 
 OptionParser.new do |opts|
 	opts.banner = "#{I18n.t('option.usage')}: mpw list [options]"
@@ -34,7 +35,7 @@ OptionParser.new do |opts|
 	end
 
 	opts.on('-g', '--group NAME', I18n.t('option.group')) do |group|
-		options[:group] = group
+		values[:group] = group
 	end
 
 	opts.on('-h', '--help', I18n.t('option.help')) do
@@ -43,7 +44,7 @@ OptionParser.new do |opts|
 	end
 
 	opts.on('-p', '--pattern PATTERN', I18n.t('option.pattern')) do |pattern|
-		options[:pattern] = pattern
+		values[:pattern] = pattern
 	end
 
 	opts.on('-w', '--wallet NAME', I18n.t('option.wallet')) do |wallet|
@@ -54,11 +55,7 @@ end.parse!
 config = MPW::Config.new(options[:config])
 cli    = MPW::Cli.new(config, options[:sync])
 
-opts = { search: options[:pattern],
-         group:  options[:group],
-       }
-
 cli.load_config
 cli.get_wallet(options[:wallet])
 cli.decrypt
-cli.list(opts)
+cli.list(values)
diff --git a/bin/mpw-update b/bin/mpw-update
index cdd3af1..598920b 100644
--- a/bin/mpw-update
+++ b/bin/mpw-update
@@ -25,6 +25,7 @@ require 'mpw/cli'
 # --------------------------------------------------------- #
 
 options = {}
+values  = {}
 
 OptionParser.new do |opts|
 	opts.banner = "#{I18n.t('option.usage')}: mpw update [options]"
@@ -34,7 +35,7 @@ OptionParser.new do |opts|
 	end
 
 	opts.on('-g', '--group NAME', I18n.t('option.group')) do |group|
-		options[:group] = group
+		values[:group] = group
 	end
 
 	opts.on('-h', '--help', I18n.t('option.help')) do
@@ -43,7 +44,7 @@ OptionParser.new do |opts|
 	end
 
 	opts.on('-p', '--pattern PATTERN', I18n.t('option.pattern')) do |pattern|
-		options[:pattern] = pattern
+		values[:pattern] = pattern
 	end
 
 	opts.on('-w', '--wallet NAME', I18n.t('option.wallet')) do |wallet|
@@ -54,11 +55,7 @@ end.parse!
 config = MPW::Config.new(options[:config])
 cli    = MPW::Cli.new(config, options[:sync])
 
-opts = { search: options[:pattern],
-         group:  options[:group],
-       }
-
 cli.load_config
 cli.get_wallet(options[:wallet])
 cli.decrypt
-cli.update(opts)
+cli.update(values)
diff --git a/lib/mpw/mpw.rb b/lib/mpw/mpw.rb
index 0727636..884f752 100644
--- a/lib/mpw/mpw.rb
+++ b/lib/mpw/mpw.rb
@@ -240,7 +240,7 @@ class MPW
 	def list(options={})
 		result = []
 
-		search = options[:search].to_s.downcase
+		search = options[:pattern].to_s.downcase
 		group  = options[:group].to_s.downcase
 
 		@data.each do |item|