fix #222, fix timestamp filter