Issue #2331477: Make it possible to have the same option set rendered multiple times on the same page