Improve current neocomplete initialization
Improved current neocomplete