Fixed matching on original message in all filters