Hack to handle empty names for keywords (needs proper fix)