r1840 + fix broken "Add many RSes" form