Improved next/last navigation.