Add CRUD - refactor autocomplite