risk + blacklist added, filters mostly fixed