Cleaned up FieldMatching - no longer passing in fields backwards