Improve the clentry provided in mass-rebuild view