Add proper ordering on survey page