Sorting directly on keyword change
Refactored keyword change and added keywords

Autoupdate of keywords
Refactored keywords.