sug-212 fixed autoselect on partial match
sug-212 merge to master