Some more work on auto-complete integration.