Fix/angular sort header reset 7166