MAL-79 | Change autocomplete
Fix sniffs
Fix test