Fix ETA calculation
Do not try to store None when there are no matching units