Add completion sorting