case 2416 - Fixed autocomplete issue.