#619 further changes to support the introduction of rethinkdb
- cancelled date range completion