Added return-if-no-relationship query