more location sort fixes