Improved by performance by only querying the auto complete list once.