The two spans right now is a workaround for getting it to sort properly. Raised a bug on that and will revisit later