Add keywordId as additional field to search on
Merge remote-tracking branch 'upstream/master'