Added correct handling of keywords and descriptions