Changed heuristics for finding vocabularies