Fix bug where we want flat keyword list.