[AI-503] Apply indicator sort order consistently