fix scanner and keyword
#229
+17
−3
Draft
and keyword
#229