Trimmed Wiki-style type disambiguation of entities.
Added links to evaluation queries.