Fix fatal error on section function. Enhance product variant selection