Fixed the messaging that wasn't specific enough so 
that now, messages are filtered by token