Re-introduced sorting autocomplete names.
Fixed completed text not matching first result