Fixes for duplicated messages in papertrail

I was seeing duplicated messages because they weren't being dropped correctly. The messages were also tagged under (I can't quite work out why) the wrong tags sometimes, too.