Some bug fixes

This PR fixes the followings:
  * autocompletion exception
  * non-working analytics

Also this PR syncs the submodule with latest changes