Bug fix: Not all keywords displayed in popup