Allow oneliner updates
Handle null oneliner messages better in ResportMap