WL-3487 Variety feedback fixes