Fixed spam bug and added filter

Signed-off-by: James Boggs <jmsboggs@gmail.com>