[OE-4414] Replace attribute options loop to prevent skipping