Make the labels option work properly for non foreign key columns