Issue #20: Dictionary tag-text first version