CS fix
Added keyword completion