Yeah, I'm not sure it's the best thing to do, but it works for now. Filtering the messages was going to be a pain without this change.