Expand to new items (fixes #309)
Expand to renamed items (fixes #334)