Adding traces to fix autocomplete issue