fix analytics reporting bugs