filter out last day of data, simplify iszero->zero

Change-Id: If414ca8774a307f75402a4ffb6ad7aa5494307d3