simplify spam filter, fixes