rework save selector, add parent/next