Corrections to manage keywords