Fixed a significant issue with keywords not being set.