Changed the way md5/sha1 matching is determined