Changes to EntityName searching