KRACOEUS-8535: speeding up PD search in order to address hierarchy issue...

...s.