Additional fixes for fields.location.updateItem