Fix to parsing menu items with tags