Perfect the keyword picking: avoid extract subword in a word. Fix minor issue