Added filter for comments