Updated AutocompleteType changes into 2.4.4 codebase. Optimized code for my needs.