Added sorting on location