Prev/next triggers improvements