diff --git a/lib/DDG/Goodie/SecurityAddons.pm b/lib/DDG/Goodie/SecurityAddons.pm
index 5e29cc9e1..887d2edc2 100644
--- a/lib/DDG/Goodie/SecurityAddons.pm
+++ b/lib/DDG/Goodie/SecurityAddons.pm
@@ -20,28 +20,21 @@ attribution github => ["lights0123", "lights0123"],
             web => ["http://lights0123.com", "lights0123"];
 
 # Triggers
-triggers startend => "how to browse the web anonymously", "search privately", "search anonymously", "how to browse the web privately"; #if the keywords are at the beginning or end, then trigger
+triggers startend => "privacy extensions", "privacy addons", "privacy extension", "privacy addon"; #if the keywords are at the beginning or end, then trigger
 
-# Handle statement
-handle remainder => sub {
-    
-    if (!($_ eq "firefox" || $_ eq "safari" || $_ eq "google chrome" || $_ eq "opera" || $_ eq "chrome" || $_ eq "")) { #if one of the keywords is not found, then exit
-        return;
-    }
-    
-    my $plaintext="Firefox: https://addons.mozilla.org/en-US/firefox/collections/mozilla/privacy/";
-    $plaintext.="\nSafari: https://extensions.apple.com/?category=security";
-    $plaintext.="\nGoogle Chrome: https://chrome.google.com/webstore/search/anonymous";
-    $plaintext.="\nOpera: https://addons.opera.com/en/extensions/category/privacy-security/?order=popular&language=en";
-    my @record_data = {
-        'Firefox' => "https://addons.mozilla.org/en-US/firefox/collections/mozilla/privacy/",
-        'Safari' => "https://extensions.apple.com/?category=security",
-        'Google Chrome' => "https://chrome.google.com/webstore/search/anonymous",
-        'Opera' => "https://addons.opera.com/en/extensions/category/privacy-security/?order=popular&language=en"
-    };
-    my @record_keys = ["Firefox", "Safari", "Google Chrome", "Opera"];
-	return $plaintext,
-    structured_answer => {
+my @triggerwords = ("firefox", "safari", "google chrome", "opera", "chrome");
+my $plaintext="Firefox: https://addons.mozilla.org/en-US/firefox/collections/mozilla/privacy/";
+$plaintext.="\nSafari: https://extensions.apple.com/?category=security";
+$plaintext.="\nGoogle Chrome: https://chrome.google.com/webstore/search/anonymous";
+$plaintext.="\nOpera: https://addons.opera.com/en/extensions/category/privacy-security/?order=popular&language=en";
+my @record_data = {
+    'Firefox' => "https://addons.mozilla.org/en-US/firefox/collections/mozilla/privacy/",
+    'Safari' => "https://extensions.apple.com/?category=security",
+    'Google Chrome' => "https://chrome.google.com/webstore/search/anonymous",
+    'Opera' => "https://addons.opera.com/en/extensions/category/privacy-security/?order=popular&language=en"
+};
+my @record_keys = ["Firefox", "Safari", "Google Chrome", "Opera"];
+my @structured_answer = {
         id => "security_addons",
         name => "software",
         data => {
@@ -56,6 +49,15 @@ handle remainder => sub {
             },
         },
     };
+
+handle remainder => sub {
+    if($_){
+        my $remainder = $_;
+        return unless grep { $remainder eq $_ } @triggerwords;
+    }
+    
+	return $plaintext,
+    structured_answer => @structured_answer;
 };
 
 1;
diff --git a/t/SecurityAddons.t b/t/SecurityAddons.t
index 702824de1..fa7dfda6d 100644
--- a/t/SecurityAddons.t
+++ b/t/SecurityAddons.t
@@ -39,20 +39,20 @@ ddg_goodie_test(
 		'DDG::Goodie::SecurityAddons'
 	],
     
-    'how to browse the web anonymously' => $answer,
-    'search privately' => $answer,
-    'search anonymously' => $answer,
-    'how to browse the web privately' => $answer,
+    'privacy extensions' => $answer,
+    'privacy extension' => $answer,
+    'privacy addons' => $answer,
+    'privacy addon' => $answer,
     
-    'how to browse the web privately firefox' => $answer,
-    'firefox how to browse the web privately' => $answer,
+    'privacy extensions firefox' => $answer,
+    'firefox privacy extension' => $answer,
     
-    'google chrome how to browse the web privately' => $answer,
-    'opera how to browse the web privately' => $answer,
-    'safari how to browse the web privately' => $answer,
+    'google chrome privacy addons' => $answer,
+    'opera privacy addon' => $answer,
+    'safari privacy extensions' => $answer,
     
-    'ie how to browse the web privately' => undef,
-    'internet explorer how to browse the web privately' => undef,
+    'ie privacy extension' => undef,
+    'internet explorer privacy addons' => undef,
 );
 
 done_testing;