Fix autocomplete
Fix return array