Fix keywords split on comma. Refactor keyword and discipline handling.