Make tag-lookup use string comparison instead of scanning