Added Whole word option for kw and kg
Implemented whole word mathing
Merged with ui upstream