refactor comments and search