[Backport 2.11] 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 24.37%. Comparing base (68f37d3) to head (b889d98).

Additional details and impacted files

@@             Coverage Diff              @@
##               2.11     #971      +/-   ##
============================================
+ Coverage     24.35%   24.37%   +0.01%     
- Complexity      951      952       +1     
============================================
  Files           255      255              
  Lines         11475    11472       -3     
  Branches       1302     1302              
============================================
+ Hits           2795     2796       +1     
+ Misses         8430     8427       -3     
+ Partials        250      249       -1     

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