Merge pull request #53 from arik-so/2023/08/query-timestamp-fix