Keyword refactoring

These changes are primarily for search hit blackboard reporting and reducing duplicated code thereof.