Fixes #8123 - Faster auto-complete with spinner