Fixes bug: Autocomplete for Optionals