Support commas inside location now