include variant id everywhere a variant is returned
switch to using variant ids in controllers