Trying to better handle items with no variants