WR321 search cleanup