add upcoming/preceding option, RT#3851