Fix metadata, allow toggling. V3.0