keywords trim fix
Merge branch 'keywords_trim_fix_from_fb' into development