Removed retry time-outs for bit messages
Fixed grouping of messages to container