Fixed Shortcuts issue. Autocomplete smoother.