Add option to *not* collapse tags to dict