Added selected option for locations and zone types