* Don't split response when there is no time field * Refactor grouping to separate function * Add test