added a empty check on nill values not to query for depends