some updates for location parsing