Fixed variants that were too long and superfluous id segments