added filtering by comments