Selector auto-rebuilder tweaks