Add soft delete and fix editor functionality