Bugfix/4202 autocomplete not working in multiple places

Looks like this was triggered by the same issue in different places