[Core] Fixed manual sorting