fix match on invalid dataset, add blacklisting support