Moved comments block into utils.search module