Do not filter out discovered_version fact

plus one small improvement