comments/search function fixed