Added more functionality for sorting and possible city filtering.