Field matching improvements