Keyword Tag & list fixes