Message filtering by severity working, needs a little cleanup