Removed workaround for #5
Fixed tag display (fixes #12)