Fixed small implementation mistakes
Preserve obsolete items by default