Improve last/this/next/every