Added search by entity name or entity number