Issue #258: Autoselect class in completion matches wrong class
Merge pull request #287 from SlavaRa/ASCompletion-improvements

Issue #258: Autoselect class in completion matches wrong class