Keyword extraction - bug fix, unit test, preparation to release