Fix rendering of primitive choices