Added latest DB updates
Bug: location edit was broken due to a newly introduced scope