date token filter bugs fixed