Bug 17817: Fix cloning subfields using select2