[Backport 2.9] Fix keywords bug incorrectly adding field value (#964)

[jowg-amazon]

Description

Manual backport of #964

Issues Resolved

[List any issues this PR will resolve]

Check List

• New functionality includes testing.
  • All tests pass
• New functionality has been documented.
  • New functionality has javadoc added
• Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 25.67%. Comparing base (88140d1) to head (e37b053).

Additional details and impacted files

@@             Coverage Diff              @@
##                2.9     #970      +/-   ##
============================================
- Coverage     25.73%   25.67%   -0.06%     
+ Complexity      951      949       -2     
============================================
  Files           252      252              
  Lines         10866    10861       -5     
  Branches       1206     1206              
============================================
- Hits           2796     2789       -7     
- Misses         7825     7826       +1     
- Partials        245      246       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.