Content-assist updates and bug fix