Changed pattern so messages aren't handled if match is used in a message with other words