Fixed issue with keywords formatting