Added protection about infinite inclusion in service dependency and groups
Updated fetchNodes calls