Auto-grouping results; performing cleanup on new targets
Fixing cleanup; making command undoable