Off-by-one error resolved
More persisting streamItems logic changes