add comments & filter