Put things back the way they were originally and fixed the Age sort correctly.