hotfix for breaking up location field update