diff --git a/data/rules/gitlab.yml b/data/rules/gitlab.yml
index 08ea0ea..1cb6bd2 100644
--- a/data/rules/gitlab.yml
+++ b/data/rules/gitlab.yml
@@ -86,7 +86,7 @@ rules:
     id: kingfisher.gitlab.3
     pattern: |
       (?xi)
-      \b
+      (?:[^A-Za-z0-9/+=]|\r\n|\\n)
       (
         glptt-[0-9a-f]{40}
       )
diff --git a/data/rules/postgres.yml b/data/rules/postgres.yml
index 27b54ea..bf4d361 100644
--- a/data/rules/postgres.yml
+++ b/data/rules/postgres.yml
@@ -28,6 +28,7 @@ rules:
       ignore_if_contains:
         - "@localhost"
         - "@127.0.0.1"
+        - "localhost:"
     min_entropy: 3.3
     confidence: medium
     examples:
diff --git a/data/rules/telegram.yml b/data/rules/telegram.yml
index 8786d64..f77daf4 100644
--- a/data/rules/telegram.yml
+++ b/data/rules/telegram.yml
@@ -4,12 +4,14 @@ rules:
     pattern: |
       (?xi)
       \b
+      (?:telegram|tgram:)
+      (?:.|[\n\r]){0,32}?
       (
-          [0-9]{8,10}
+          [0-9]{7,10}
           :
           [A-Z0-9_-]{35}
       )
-      \b
+      (?:[^A-Za-z0-9/+=])
     pattern_requirements:
       min_digits: 2
     confidence: medium
@@ -27,6 +29,6 @@ rules:
               words:
                 - '"ok":true'
     examples:
-      - "110201543:AAHdqTcvCH1vGWJxfSeofSAs0K5PALDsawd"
-      - "508627689:AAEuLPKs-EhrjrYGnz60bnYNZqakf6HJxc0"
-      - "3628091811:BAG9RuJiqgOGIfFbOPBpAo6QhIJoD9mCdDs"
+      - "tgram://110201543:AAHdqTcvCH1vGWJxfSeofSAs0K5PALDsawd"
+      - "telegram: 508627689:AAEuLPKs-EhrjrYGnz60bnYNZqakf6HJxc0"
+      - "telegram token is 3628091811:BAG9RuJiqgOGIfFbOPBpAo6QhIJoD9mCdDs"
\ No newline at end of file
diff --git a/data/rules/uri.yml b/data/rules/uri.yml
index e5542be..04c8057 100644
--- a/data/rules/uri.yml
+++ b/data/rules/uri.yml
@@ -3,17 +3,19 @@ rules:
     id: kingfisher.uri.1
     pattern: |
       (?xi)
-      (https?)://
-      [a-z][a-z0-9+\-.]*
-      :
-      [a-z0-9\-._~%!$&'()*,;=]+
-      @
-      (?:[a-z0-9\-._~%]+|\[[a-f0-9:.]+\]|\[v[a-f0-9][a-z0-9\-._~%!$&'()*,;=:]+\])
-      (:?[0-9]+)?
-      (?:/[a-z0-9\-._~%!$&'()*,;=:@]*)* # Match path
-      /?
-      (?:\?[a-z0-9\-._~%!$&'()*,;=:@/?]*)?
-      (?:\#[a-z0-9\-._~%!$&'()*,;=:@/?]*)?
+      (
+        (?:https?)://
+        [A-Za-z](?:[A-Za-z0-9+\-._~!$&'()*+,;=]|%[0-9A-Fa-f]{2})*
+        :
+        (?:[A-Za-z0-9\-._~!$&'()*+,;=]|%[0-9A-Fa-f]{2})+
+        @
+        (?:[A-Za-z0-9\-._~%]+|\[[A-Fa-f0-9:.]+\]|\[v[A-Fa-f0-9][A-Za-z0-9\-._~%!$&'()*,;=:]+\])
+        (:?[0-9]+)?
+        (?:/[A-Za-z0-9\-._~%!$&'()*,;=:@%]*)*
+        /?
+        (?:\?[A-Za-z0-9\-._~%!$&'()*,;=:@/?%]*)?
+        (?:\#[A-Za-z0-9\-._~%!$&'()*,;=:@/?%]*)?
+      )
     min_entropy: 4.0
     confidence: medium
     examples: