more fix of keywords