ARQ-1543 Fixed behavior for multiple qualifer/type Drones in single scope