Resolved #20, updated date query