diff --git a/lib/filter/command.rb b/lib/filter/command.rb
index 024d8a8e1..34027bc61 100644
--- a/lib/filter/command.rb
+++ b/lib/filter/command.rb
@@ -32,7 +32,6 @@ module BeEF
 
     # check if valid command module datastore value
     def self.is_valid_commmamd_module_datastore_param?(str)
-      return false if not BeEF::Filter.is_non_empty_string?(str)
       return false if BeEF::Filter.has_null?(str)
       return false if BeEF::Filter.has_non_printable_char?(str)    
       true  
@@ -41,7 +40,7 @@ module BeEF
     # check for word and some punc chars
     def self.has_valid_key_chars?(str)
       return false if not BeEF::Filter.is_non_empty_string?(str)
-      (str =~ /[^\w_-]/).nil?
+      (str =~ /[^\w\d\s()-.,;_\302\256]/).nil?
     end
 
     # check for word and underscore chars