Ndab: Changed behaviour for getting connected entities