Comments and replies

Instead of only checking comments