Some changes in the query builder. We have a first solution for the estimated time in the analytics algorithms.