added simple field matching