Different fixes regarding variants and collections sorting