Attempt to fix double colons when targeting a user
Improve trigger matching