Add separate next/prev combo for Ag use