Fix matching when field value is zero

review1041003