Minor
Message source type filter and refactoring