Small auto-complete enhancement/bugfix