some autocomplete enhancements, fixed #473