Better matching of fields