fix keywords mapping