added message_id tags to distinct queries from replies
added the missing flags for the message