affinityitems validation improvements