Fix scenarios related to locale grid