Issue #12: fix set query date