#368 martinyde - Changed variant selction order and rules