Fixes and keywords list refactoring