Fix handling of REQ_NEXT/REQ_PREVIOUS