improving coverage on rearrange fields