improve next & prev issue