Improve autocomplete in shell command