Have location field support new options