Move to the new material-UI autocomplete Component
It should be a good idea to switch to the new autocomplete component from Material-UI: https://material-ui.com/components/autocomplete/
It will simplify a bit the code-base. Don't forget to make it fuzzy: https://material-ui.com/components/autocomplete/#advanced