#84 Add improvements against spam