catch return in search and add extra return to comment