graph lazy loading fixes