Fixed keywords bugs