Made selection lists compatible with the new template variable format