Added workaround to keep the original order of choices list in AutocompleteGeneric class
Sick and non-standard version bump to be used in private project