Added deleting support
Fixed duplication of items when re-expanded