track sort rework, also using number from name