Fixed bug where not every type for every unit gets requested