diff --git a/core_js/tools.js b/core_js/tools.js
index dac0735..b172a97 100644
--- a/core_js/tools.js
+++ b/core_js/tools.js
@@ -120,7 +120,7 @@ function extractFileds(url)
             fields = fields.replace(new RegExp("#.*", "i"), "");
         }
 
-        return (fields.match(/[^\/|\?|&]+=?[^|&]*/gi) || []);
+        return (fields.match(/[^\/|\?|&]+=?[^&]*/gi) || []);
     }
 
     return [];
diff --git a/data/data.min.json b/data/data.min.json
index 0f76823..02f9f43 100644
--- a/data/data.min.json
+++ b/data/data.min.json
@@ -597,6 +597,15 @@
             "redirections": [
                 ".*linksynergy\\.com.*\\/.*murl=([^&]*)"
             ]
+        },
+        "giphy.com": {
+            "urlPattern": "https?:\\/\\/([a-zA-Z0-9-]*\\.)?(giphy\\.com).*",
+            "completeProvider": false,
+            "rules": [
+                "ref"
+            ],
+            "exceptions": [],
+            "redirections": []
         }
     }
 }