sort and text fix