Improved field match expressions