CR for Job #19865 - Names that are too long don't autocomplete correctly

Code Review for Job #19865 - Workitem available at https://www.worklist.net/19865