rewrite filtering of unsupported addresses
+ DataMessage & MessageState