Fix sorting by age and state