Better parsing of keywords