Merged with updated GasStationList activity and FilterActivity