fix Next and Last week issue