diff --git a/src/main/java/com/jagrosh/vortex/Listener.java b/src/main/java/com/jagrosh/vortex/Listener.java
index ecdcf63..5295595 100644
--- a/src/main/java/com/jagrosh/vortex/Listener.java
+++ b/src/main/java/com/jagrosh/vortex/Listener.java
@@ -73,7 +73,7 @@
                 vortex.getMessageCache().putMessage(m);
                 
                 // Run automod on the message
-                vortex.getAutoMod().performAutomod(m);
+                vortex.getAutoMod().performAutomod(m, false);
             }
         }
         else if (event instanceof MessageUpdateEvent)
@@ -85,7 +85,7 @@
             if(!m.getAuthor().isBot()) // ignore bot edits
             {
                 // Run automod on the message
-                vortex.getAutoMod().performAutomod(m);
+                vortex.getAutoMod().performAutomod(m, true);
                 
                 // Store and log the edit
                 CachedMessage old = vortex.getMessageCache().putMessage(m);
diff --git a/src/main/java/com/jagrosh/vortex/automod/AutoMod.java b/src/main/java/com/jagrosh/vortex/automod/AutoMod.java
index f6d0186..1f74b4b 100644
--- a/src/main/java/com/jagrosh/vortex/automod/AutoMod.java
+++ b/src/main/java/com/jagrosh/vortex/automod/AutoMod.java
@@ -255,7 +255,7 @@
         catch(Exception ignore) {}
     }
     
-    public void performAutomod(Message message) 
+    public void performAutomod(Message message, Boolean isEdit) 
     {
         //ignore users with Manage Messages, Kick Members, Ban Members, Manage Server, or anyone the bot can't interact with
         if(!shouldPerformAutomod(message.getMember(), message.getChannel().asTextChannel()))
@@ -281,17 +281,22 @@
         AutomodStatus currentStatus = new AutomodStatus();
         if(preventSpam)
         {
-            runAntiDuplicate(settings, currentStatus, message);
+            if (!isEdit)
+                runAntiDuplicate(settings, currentStatus, message);
             runMaxLines(settings, currentStatus, message);
             runAntiCopypasta(settings, currentStatus, message);
-            runAntiEveryone(settings, currentStatus, message);
+            if (!isEdit)
+                runAntiEveryone(settings, currentStatus, message);
         }
         if(preventInvites)
         {
             runAntiInvite(settings, currentStatus, message, inviteWhitelist);
         }
-        runAntiMention(settings, currentStatus, message);
-        runAntiMentionRoles(settings, currentStatus, message);
+        if (!isEdit)
+        {
+            runAntiMention(settings, currentStatus, message);
+            runAntiMentionRoles(settings, currentStatus, message);
+        }
         runAntiReferral(settings, currentStatus, message);
         runFilters(settings, currentStatus, message, filters);
         
@@ -466,7 +471,7 @@
     {
         if(settings.everyoneStrikes <= 0 || message.getMember().hasPermission(message.getChannel().asTextChannel(), Permission.MESSAGE_MENTION_EVERYONE))
             return;
-        String filtered = message.getContentRaw().replace("`@everyone`", "").replace("`@here`", "");
+        String filtered = message.getContentRaw().replace("`@everyone`", "").replace("`@here`", "").replace("\\@everyone", "").replace("\\@here", "");
         if(filtered.contains("@everyone") || filtered.contains("@here")
                 || message.getMentions().getRoles().stream().anyMatch(role -> role.getName().equalsIgnoreCase("everyone") || role.getName().equalsIgnoreCase("here")))
         {
diff --git a/src/main/java/com/jagrosh/vortex/commands/automod/FilterCmd.java b/src/main/java/com/jagrosh/vortex/commands/automod/FilterCmd.java
index ec2cd60..0c34066 100644
--- a/src/main/java/com/jagrosh/vortex/commands/automod/FilterCmd.java
+++ b/src/main/java/com/jagrosh/vortex/commands/automod/FilterCmd.java
@@ -80,11 +80,11 @@
         @Override
         protected void execute(CommandEvent event)
         {
-            // if(!vortex.getDatabase().premium.getPremiumInfo(event.getGuild()).level.isAtLeast(PremiumManager.Level.PRO))
-            // {
-            //     event.reply(PremiumManager.Level.PRO.getRequirementMessage());
-            //     return;
-            // }
+            if(!vortex.getDatabase().premium.getPremiumInfo(event.getGuild()).level.isAtLeast(PremiumManager.Level.PRO))
+            {
+                event.reply(PremiumManager.Level.PRO.getRequirementMessage());
+                return;
+            }
             
             String[] parts = event.getArgs().split("\\s+", 3);
             if(parts.length < 3)
diff --git a/src/main/java/com/jagrosh/vortex/utils/FormatUtil.java b/src/main/java/com/jagrosh/vortex/utils/FormatUtil.java
index 5f8148a..105fae0 100644
--- a/src/main/java/com/jagrosh/vortex/utils/FormatUtil.java
+++ b/src/main/java/com/jagrosh/vortex/utils/FormatUtil.java
@@ -18,9 +18,7 @@
 import com.jagrosh.jdautilities.command.Command;
 import com.jagrosh.jdautilities.command.CommandEvent;
 import java.util.List;
-import net.dv8tion.jda.api.entities.Role;
-import net.dv8tion.jda.api.entities.User;
-import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
+
 import com.jagrosh.vortex.Constants;
 import com.jagrosh.vortex.Vortex;
 import com.jagrosh.vortex.logging.MessageCache.CachedMessage;
@@ -84,7 +82,7 @@
     
     public static String formatFullUser(User user)
     {
-        return filterEveryone("**"+user.getName()+"**"+" (ID:"+user.getId()+")");
+        return filterEveryone("(ID:"+user.getId()+") "+"**"+user.getName()+"**");
     }
     
     public static String capitalize(String input)
@@ -303,8 +301,8 @@
     public static String helpLinks(CommandEvent event)
     {
         return "\uD83D\uDD17 ["+event.getSelfUser().getName()+" Wiki]("+Constants.Wiki.WIKI_BASE+")\n" // 🔗
-                + "<:dickcord:1253389864817397901> [Support Server]("+event.getClient().getServerInvite()+")\n"
+                + "<:discord:1511662298761138176> [Support Server]("+event.getClient().getServerInvite()+")\n"
                 +  CMD_EMOJI + " [Full Command Reference]("+Constants.Wiki.COMMANDS+")\n"
-                + "<:dickreon:1253389956857069711> [Donations]("+Constants.DONATION_LINK+")";
+                + "<:patreon:1511662363496022026> [Donations]("+Constants.DONATION_LINK+")";
     }
 }
\ No newline at end of file