Updated completions to stop interupting keywords