ECOM-587 fixed tab order