Update controllers to address sort order issues