Fixed add, delete, search by name