Improved field matching