FIX: Zero_geometry broken: +
FIX: Label truncated if spaces present