[Backport 2.5] 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 35.96%. Comparing base (2d10915) to head (4aea86c).

Additional details and impacted files

@@             Coverage Diff              @@
##                2.5     #968      +/-   ##
============================================
- Coverage     36.00%   35.96%   -0.05%     
+ Complexity      894      893       -1     
============================================
  Files           179      179              
  Lines          7213     7208       -5     
  Branches        870      870              
============================================
- Hits           2597     2592       -5     
  Misses         4381     4381              
  Partials        235      235              

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