Improve haveField matcher