Narrow the raw query field.
Handle time interpolation on raw queries.
Clean up retry and promises.