Upgrading AM for index sort from Greg API