Initial version of limited search during routing is implemented.
Aggregation is improved, different tests for aggregation are added.