location sort improved