WR321 cleanup search