Fixed #92 - autocomplete works correctly now