Fixed search by name