Fixed auto completion issues