MOB-124: Added handling for zero-length hearters and comments array on count update