more fix to keywords