Fix: INF-253 o2 api failed after too many queries (part 2)