Fix: escape entity name
Consider all factors
Fix: consistent score