Location ordering now throws empty locations in the back.
Tweaked sort order a little