Added search for comments