Fix for autocomplete. (DHH-401)