Fix by Tom Reed for Tag Search