fixes #2130
wip
* Refactor iqdb response collection