Fixed wrapping issue identified in #1703 for module-spotlight