Fix message completion trigger to work anywhere in the message (#3696)

Fix message completion trigger to work anywhere in the message (#3696) #8987