Fix sub-node opening
Remove deprecated component
Name vs. id harmonization
Simpler context object