Updated to deal with comparing the MODULUS attribute with non-exact matches