Sort insertion order using int instead of string.

Related to #583
1 job for master in 10 minutes and 12 seconds (queued for 1 second)