Fix failed test. Backward compatibility.
Fix failed unit test. Wrong indentation.
Pep8.
Merge pull request #1100 from ismailsunni/keyword_dialog

Keyword dialog