refactor

Using filter instead of contains for performance

started work to hook into reply/show all buttons, issue at the moment
with it still not finding the new comments...