fix multiple messages, add field id