resolve pr comments
fix missing extended rendering