We can't sort by relation fields anymore
Improve translation handling